cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-15 00:53:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into sqlfix

Browse Source 
# Conflicts:
#	SQL/paradise_schema.sql
#	SQL/paradise_schema_prefixed.sql
This commit is contained in:
Mark van Alphen
2019-07-20 18:49:03 +02:00
parent f064403375 f8662f0833
commit 5e70eeddc8
273 changed files with 14885 additions and 7528 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SQL/paradise_schema.sql
+3 -2
View File
@@ -254,7 +254,7 @@ CREATE TABLE `player` (
`UI_style_alpha` smallint(4) DEFAULT '255',
`be_role` mediumtext,
`default_slot` smallint(4) DEFAULT '1',
`toggles` mediumint(8) DEFAULT '383',
`toggles` int(8) DEFAULT '383',
`sound` mediumint(8) DEFAULT '31',
`randomslot` tinyint(1) DEFAULT '0',
`volume` smallint(4) DEFAULT '100',
@@ -267,7 +267,8 @@ CREATE TABLE `player` (
`clientfps` smallint(4) DEFAULT '0',
`atklog` smallint(4) DEFAULT '0',
`fuid` bigint(20) NULL DEFAULT NULL,
`fupdate` smallint(4) NULL DEFAULT 0,
`fupdate` smallint(4) NULL DEFAULT '0',
`afk_watch` tinyint(1) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`),
UNIQUE KEY `ckey` (`ckey`)
) ENGINE=InnoDB AUTO_INCREMENT=32446 DEFAULT CHARSET=latin1;
SQL/paradise_schema_prefixed.sql
+3 -2
View File
@@ -253,7 +253,7 @@ CREATE TABLE `SS13_player` (
`UI_style_alpha` smallint(4) DEFAULT '255',
`be_role` mediumtext,
`default_slot` smallint(4) DEFAULT '1',
`toggles` mediumint(8) DEFAULT '383',
`toggles` int(8) DEFAULT '383',
`sound` mediumint(8) DEFAULT '31',
`randomslot` tinyint(1) DEFAULT '0',
`volume` smallint(4) DEFAULT '100',
@@ -266,7 +266,8 @@ CREATE TABLE `SS13_player` (
`clientfps` smallint(4) DEFAULT '0',
`atklog` smallint(4) DEFAULT '0',
`fuid` bigint(20) NULL DEFAULT NULL,
`fupdate` smallint(4) NULL DEFAULT 0,
`fupdate` smallint(4) NULL DEFAULT '0',
`afk_watch` tinyint(1) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`),
UNIQUE KEY `ckey` (`ckey`)
) ENGINE=InnoDB AUTO_INCREMENT=32446 DEFAULT CHARSET=latin1;
SQL/updates/6-7.sql
+2
View File
@@ -0,0 +1,2 @@
ALTER TABLE player
MODIFY COLUMN toggles int;
SQL/updates/7-8.sql
+2
View File
@@ -0,0 +1,2 @@
# Add afk_watch which gives users the option to make use of the AFK watcher subsystem
ALTER TABLE `player` ADD `afk_watch` tinyint(1) NOT NULL DEFAULT '0';