diff --git a/Plugins[Modified]/Mineplex.Core.Common/src/mineplex/core/common/Constants.java b/Plugins[Modified]/Mineplex.Core.Common/src/mineplex/core/common/Constants.java index 32a6014c..3f6ea91d 100644 --- a/Plugins[Modified]/Mineplex.Core.Common/src/mineplex/core/common/Constants.java +++ b/Plugins[Modified]/Mineplex.Core.Common/src/mineplex/core/common/Constants.java @@ -20,7 +20,7 @@ import com.mojang.util.UUIDTypeAdapter; public class Constants { - public static final String WEB_ADDRESS = "http://accounts.mineplex.com/"; + public static final String WEB_ADDRESS = "http://127.0.0.1:1000/"; public static final String WEB_CONFIG_KEY = "webServer"; public static Gson GSON; diff --git a/Plugins[Modified]/Mineplex.Core.Common/src/mineplex/core/common/util/UtilServer.java b/Plugins[Modified]/Mineplex.Core.Common/src/mineplex/core/common/util/UtilServer.java index 5fa174ee..214708e3 100644 --- a/Plugins[Modified]/Mineplex.Core.Common/src/mineplex/core/common/util/UtilServer.java +++ b/Plugins[Modified]/Mineplex.Core.Common/src/mineplex/core/common/util/UtilServer.java @@ -153,7 +153,7 @@ public class UtilServer public static boolean isTestServer() { - return isTestServer(true); + return isTestServer(false); } public static boolean isTestServer(boolean bypass) diff --git a/Plugins[Modified]/Mineplex.Core/src/mineplex/core/twofactor/TwoFactorAuth.java b/Plugins[Modified]/Mineplex.Core/src/mineplex/core/twofactor/TwoFactorAuth.java index 14fb22ae..3cfb5bef 100644 --- a/Plugins[Modified]/Mineplex.Core/src/mineplex/core/twofactor/TwoFactorAuth.java +++ b/Plugins[Modified]/Mineplex.Core/src/mineplex/core/twofactor/TwoFactorAuth.java @@ -217,6 +217,8 @@ public class TwoFactorAuth extends MiniClientPlugin TwoFactorData data = Get(player); + /* + if (data.getLastLoginIp().isPresent() && player.getAddress().getAddress().toString().substring(1).equals(data.getLastLoginIp().get())) { player.sendMessage(F.main("2FA", "Authenticated")); @@ -237,17 +239,20 @@ public class TwoFactorAuth extends MiniClientPlugin runSync(() -> setup2FA(event.getPlayer())); } } + */ } @EventHandler public void onQuit(PlayerQuitEvent event) { + /* Player player = event.getPlayer(); if (setupData.remove(player.getUniqueId()) != null) { player.setItemInHand(null); } authenticating.remove(player.getUniqueId()); + */ } @EventHandler(priority = EventPriority.LOWEST) diff --git a/Plugins[Modified]/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/repository/SkillRepository.java b/Plugins[Modified]/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/repository/SkillRepository.java index b9f244dc..ae0b1745 100644 --- a/Plugins[Modified]/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/repository/SkillRepository.java +++ b/Plugins[Modified]/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/repository/SkillRepository.java @@ -1,5 +1,6 @@ package mineplex.minecraft.game.classcombat.Skill.repository; +import java.util.ArrayList; import java.util.List; import com.google.gson.reflect.TypeToken; @@ -17,6 +18,7 @@ public class SkillRepository extends MinecraftRepository public List GetSkills(List skills) { - return handleSyncMSSQLCall("Dominate/GetSkills", skills, new TypeToken>(){}.getType()); + //return handleSyncMSSQLCall("Dominate/GetSkills", skills, new TypeToken>(){}.getType()); + return new ArrayList(); } } diff --git a/Plugins[Modified]/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java b/Plugins[Modified]/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java index 82df6188..40207a15 100644 --- a/Plugins[Modified]/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java +++ b/Plugins[Modified]/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java @@ -92,7 +92,7 @@ public class ServerGroup _tournament = Boolean.valueOf(data.get("tournament")); _tournamentPoints = Boolean.valueOf(data.get("tournamentPoints")); _hardMaxPlayerCap = Boolean.valueOf(data.get("hardMaxPlayerCap")); - _games = data.get("games"); + _games = data.getOrDefault("games", "Smash"); _modes = data.get("modes"); _boosterGroup = data.get("boosterGroup"); _serverType = data.getOrDefault("serverType", "dedicated"); diff --git a/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java b/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java index f06904e9..17445216 100644 --- a/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java +++ b/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java @@ -71,7 +71,7 @@ import mineplex.core.stats.StatsManager; import mineplex.core.status.ServerStatusManager; import mineplex.core.teleport.Teleport; import mineplex.core.thank.ThankManager; -//import mineplex.core.twofactor.TwoFactorAuth; +import mineplex.core.twofactor.TwoFactorAuth; import mineplex.core.updater.FileUpdater; import mineplex.core.updater.Updater; import mineplex.core.velocity.VelocityFix; @@ -207,7 +207,7 @@ public class Arcade extends JavaPlugin new FoodDupeFix(this); //two factor is mad annoying` - //require(TwoFactorAuth.class); + require(TwoFactorAuth.class); require(WebsiteLinkManager.class); //require(TwitchIntegrationFix.class); diff --git a/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java b/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java index 9d32cfe4..4e1826cc 100644 --- a/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java +++ b/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java @@ -1377,7 +1377,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation { TimingManager.start("ArcadeManager LoadFiles"); - File folder = new File(".." + File.separatorChar + ".." + File.separatorChar + "update" + File.separatorChar + File folder = new File("update" + File.separatorChar + "maps" + File.separatorChar + gameName); System.out.println(folder.getAbsolutePath() + " -=-=-=-=-="); if (!folder.exists()) diff --git a/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java b/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java index 26f26c31..72170983 100644 --- a/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java +++ b/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java @@ -494,6 +494,7 @@ public abstract class Game extends ListenerComponent implements Lifetimed caller.sendMessage(F.main("Kit", "Sorry, but that is not a kit!")); }); + registerDebugCommand("cooldown", Perm.DEBUG_COMMANDS, PermissionGroup.ADMIN, (caller, args) -> { for (Player other : UtilServer.getPlayers()) diff --git a/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java b/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java index b16e1ec7..5dbb31da 100644 --- a/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java +++ b/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java @@ -380,6 +380,12 @@ public class GameCreationManager implements Listener _maps.put(type, Manager.LoadFiles(type.getName())); } + if(MapPref == null){ + if(_maps.get(gameType) != null){ + MapPref = _maps.get(gameType).get(0); + } + } + if (MapPref != null) { MapPref = MapPref.replace(" ", ""); @@ -425,7 +431,7 @@ public class GameCreationManager implements Listener } else { - System.out.println("Map Preference: None"); + System.out.println("Map Preference: None "); } } diff --git a/server_configs/Arcade/update/maps/COPY_MAPS_FOLDER_CONTENT_TO_HERE b/server_configs/Arcade/update/maps/COPY_MAPS_FOLDER_CONTENT_TO_HERE new file mode 100644 index 00000000..e69de29b diff --git a/sql_dumps/account.sql b/sql_dumps/account.sql index d0f8434d..b82bce65 100644 --- a/sql_dumps/account.sql +++ b/sql_dumps/account.sql @@ -3,9 +3,9 @@ -- https://www.phpmyadmin.net/ -- -- Máy chủ: 127.0.0.1 --- Thời gian đã tạo: Th8 19, 2021 lúc 11:32 AM --- Phiên bản máy phục vụ: 10.4.20-MariaDB --- Phiên bản PHP: 7.4.21 +-- Thời gian đã tạo: Th5 20, 2023 lúc 08:13 AM +-- Phiên bản máy phục vụ: 10.4.22-MariaDB +-- Phiên bản PHP: 7.4.27 SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; START TRANSACTION; @@ -46,6 +46,17 @@ CREATE TABLE `accountcustomdata` ( -- -------------------------------------------------------- +-- +-- Cấu trúc bảng cho bảng `accountfavouritenano` +-- + +CREATE TABLE `accountfavouritenano` ( + `accountId` int(11) NOT NULL, + `gameId` int(11) NOT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +-- -------------------------------------------------------- + -- -- Cấu trúc bảng cho bảng `accountfriend` -- @@ -106,15 +117,6 @@ CREATE TABLE `accountkits` ( `active` bit(1) NOT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; --- --- Đang đổ dữ liệu cho bảng `accountkits` --- - -INSERT INTO `accountkits` (`accountId`, `kitId`, `active`) VALUES -(1, 101, b'1'), -(1, 102, b'0'), -(1, 103, b'0'); - -- -------------------------------------------------------- -- @@ -161,38 +163,14 @@ CREATE TABLE `accountmissions` ( -- INSERT INTO `accountmissions` (`accountId`, `missionId`, `length`, `x`, `y`, `startTime`, `progress`, `complete`) VALUES -(1, 1101, 0, 5, 0, 1628076085654, 0, b'0'), -(1, 1001, 0, 23, 0, 1628076085654, 0, b'0'), -(1, 703, 0, 102, 0, 1628076085654, 0, b'0'), -(1, 1003, 0, 25, 0, 1628076085654, 0, b'0'), -(1, 502, 0, 20, 0, 1628076085654, 0, b'0'), -(1, 901, 1, 40, 0, 1628076085654, 0, b'0'), -(1, 201, 1, 360, 0, 1628076085654, 0, b'0'), -(1, 1200, 1, 75, 0, 1628076085654, 0, b'0'), -(3, 202, 0, 60, 0, 1628079940971, 0, b'0'), -(3, 900, 0, 1, 0, 1628079940971, 0, b'0'), -(3, 1000, 0, 2, 0, 1628079940971, 0, b'0'), -(3, 505, 0, 504, 0, 1628079940971, 0, b'0'), -(3, 802, 0, 4, 0, 1628079940971, 0, b'0'), -(3, 504, 1, 1255, 0, 1628079940972, 0, b'0'), -(3, 701, 1, 10, 0, 1628079940972, 0, b'0'), -(3, 901, 1, 35, 0, 1628079940972, 0, b'0'), -(4, 301, 0, 1, 0, 1629307611699, 0, b'0'), -(4, 102, 0, 18, 0, 1629307611700, 0, b'0'), -(4, 104, 0, 29, 0, 1629307611700, 0, b'0'), -(4, 1002, 0, 23, 0, 1629307611700, 0, b'0'), -(4, 600, 0, 2, 0, 1629307611700, 0, b'0'), -(4, 5, 1, 1, 56, 1629307611700, 0, b'0'), -(4, 408, 1, 14510, 0, 1629307611700, 0, b'0'), -(4, 1100, 1, 105230, 0, 1629307611701, 0, b'0'), -(5, 703, 0, 116, 0, 1629307620849, 0, b'0'), -(5, 2, 0, 16, 0, 1629307620849, 0, b'0'), -(5, 1302, 0, 33, 0, 1629307620849, 0, b'0'), -(5, 500, 0, 13, 0, 1629307620849, 0, b'0'), -(5, 100, 0, 14, 0, 1629307620849, 1, b'0'), -(5, 506, 1, 90, 0, 1629307620849, 0, b'0'), -(5, 406, 1, 10, 0, 1629307620849, 0, b'0'), -(5, 300, 1, 15, 24, 1629307620849, 0, b'0'); +(1, 702, 0, 3, 0, 1684561811286, 0, b'0'), +(1, 606, 0, 6, 0, 1684561811286, 0, b'0'), +(1, 802, 0, 3, 0, 1684561811286, 0, b'0'), +(1, 1102, 0, 13, 0, 1684561811286, 0, b'0'), +(1, 903, 0, 27, 0, 1684561811286, 0, b'0'), +(1, 6, 1, 1, 0, 1684561811287, 0, b'0'), +(1, 1201, 1, 40, 0, 1684561811287, 0, b'0'), +(1, 500, 1, 50, 0, 1684561811287, 0, b'0'); -- -------------------------------------------------------- @@ -224,14 +202,6 @@ CREATE TABLE `accountpunishments` ( `severity` int(11) NOT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; --- --- Đang đổ dữ liệu cho bảng `accountpunishments` --- - -INSERT INTO `accountpunishments` (`id`, `target`, `category`, `sentence`, `reason`, `duration`, `admin`, `severity`) VALUES -(1, 'Labality', 'ChatOffense', 'Mute', '1', 720, 'Labality', 3), -(2, 'Labality', 'Other', 'Ban', '1', -1, 'Labality', 1); - -- -------------------------------------------------------- -- @@ -241,24 +211,10 @@ INSERT INTO `accountpunishments` (`id`, `target`, `category`, `sentence`, `reaso CREATE TABLE `accountranks` ( `id` int(11) NOT NULL, `accountId` int(11) NOT NULL, - `rankIdentifier` varchar(40) DEFAULT NULL, - `primaryGroup` tinyint(1) DEFAULT NULL + `rankIdentifier` varchar(40) DEFAULT 'PLAYER', + `primaryGroup` tinyint(1) DEFAULT 1 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; --- --- Đang đổ dữ liệu cho bảng `accountranks` --- - -INSERT INTO `accountranks` (`id`, `accountId`, `rankIdentifier`, `primaryGroup`) VALUES -(3, -1, 'PLAYER', 1), -(5, 1, 'ADMIN', 0), -(1, 1, 'ADMIN', 1), -(2, 1, 'QA', 0), -(4, 1, 'SRMOD', 0), -(7, 3, 'PLAYER', 1), -(8, 4, 'PLAYER', 1), -(9, 5, 'ADMIN', 1); - -- -------------------------------------------------------- -- @@ -275,16 +231,6 @@ CREATE TABLE `accounts` ( `totalPlayTime` mediumtext DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; --- --- Đang đổ dữ liệu cho bảng `accounts` --- - -INSERT INTO `accounts` (`id`, `uuid`, `name`, `gems`, `coins`, `lastLogin`, `totalPlayTime`) VALUES -(1, '0a8cd98e-4b11-4c53-9e34-fc37cbaa7e0c', 'Labality', 0, 0, '2021-08-19 00:12:08', NULL), -(3, 'c3949f1c-739b-4eb0-859a-852cb8d352ee', 'MymagicCraft', 0, 0, '2021-08-04 19:29:15', NULL), -(4, 'fba6d312-a7d2-3e7e-8cfa-dc00ae963bcd', 'Pheonix_121', 0, 0, '2021-08-19 00:32:48', NULL), -(5, 'ccb16cbc-ad4c-3307-8774-6f4b685b3c95', 'MrEarthCreeper', 0, 0, '2021-08-19 00:32:50', NULL); - -- -------------------------------------------------------- -- @@ -297,25 +243,6 @@ CREATE TABLE `accountstatsalltime` ( `value` int(11) NOT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; --- --- Đang đổ dữ liệu cho bảng `accountstatsalltime` --- - -INSERT INTO `accountstatsalltime` (`accountId`, `statId`, `value`) VALUES -(1, 1, 4077), -(3, 1, 15), -(1, 2, 10672500), -(1, 4, 20), -(1, 5, 20), -(1, 6, 20), -(1, 12, 100), -(1, 13, 100), -(1, 14, 100), -(5, 1, 27), -(5, 4, 1), -(5, 5, 1), -(5, 6, 1); - -- -------------------------------------------------------- -- @@ -379,18 +306,14 @@ CREATE TABLE `bonus` ( `clansdailytime` timestamp NULL DEFAULT NULL, `ranktime` date DEFAULT NULL, `votetime` date DEFAULT NULL, - `clansvotetime` date DEFAULT NULL + `clansvotetime` date DEFAULT NULL, + `dailyStreak` int(11) NOT NULL, + `maxDailyStreak` int(11) NOT NULL, + `voteStreak` int(11) NOT NULL, + `maxVoteStreak` int(11) NOT NULL, + `tickets` int(11) NOT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; --- --- Đang đổ dữ liệu cho bảng `bonus` --- - -INSERT INTO `bonus` (`accountId`, `dailytime`, `clansdailytime`, `ranktime`, `votetime`, `clansvotetime`) VALUES -(1, NULL, NULL, NULL, NULL, NULL), -(4, NULL, NULL, NULL, NULL, NULL), -(5, NULL, NULL, NULL, NULL, NULL); - -- -------------------------------------------------------- -- @@ -403,13 +326,6 @@ CREATE TABLE `communities` ( `region` varchar(5) NOT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; --- --- Đang đổ dữ liệu cho bảng `communities` --- - -INSERT INTO `communities` (`id`, `name`, `region`) VALUES -(1, 'order', 'US'); - -- -------------------------------------------------------- -- @@ -445,13 +361,6 @@ CREATE TABLE `communitymembers` ( `readingChat` bit(1) NOT NULL DEFAULT b'1' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; --- --- Đang đổ dữ liệu cho bảng `communitymembers` --- - -INSERT INTO `communitymembers` (`accountId`, `communityId`, `communityRole`, `readingChat`) VALUES -(1, 1, 'LEADER', b'1'); - -- -------------------------------------------------------- -- @@ -464,37 +373,6 @@ CREATE TABLE `communitysettings` ( `settingValue` varchar(255) NOT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; --- --- Đang đổ dữ liệu cho bảng `communitysettings` --- - -INSERT INTO `communitysettings` (`settingId`, `communityId`, `settingValue`) VALUES -(5, 1, 'Gladiators'), -(5, 1, 'Speed Builders'), -(5, 1, 'Skyfall'), -(5, 1, 'Heroes of GWEN'), -(5, 1, 'Cake Wars Standard'), -(5, 1, 'Bacon Brawl'), -(5, 1, 'The Bridges'), -(6, 1, 'Closed'), -(8, 1, 'false'), -(6, 1, 'Open to Join'), -(8, 1, 'false'), -(6, 1, 'Accepting Join Requests'), -(8, 1, 'false'), -(6, 1, 'Closed'), -(8, 1, 'false'), -(6, 1, 'Open to Join'), -(8, 1, 'false'), -(6, 1, 'Accepting Join Requests'), -(8, 1, 'false'), -(3, 1, 'AQUA'), -(5, 1, 'Castle Assault'), -(5, 1, 'Castle Siege'), -(5, 1, 'Champions Domination'), -(5, 1, 'Champions TDM'), -(3, 1, 'BLUE'); - -- -------------------------------------------------------- -- @@ -531,6 +409,18 @@ CREATE TABLE `eternalgiveaway` ( -- -------------------------------------------------------- +-- +-- Cấu trúc bảng cho bảng `forumlink` +-- + +CREATE TABLE `forumlink` ( + `accountId` int(11) NOT NULL, + `userId` int(11) NOT NULL, + `powerPlayStatus` tinyint(1) NOT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +-- -------------------------------------------------------- + -- -- Cấu trúc bảng cho bảng `incognitostaff` -- @@ -596,6 +486,36 @@ CREATE TABLE `newnpcsnew` ( -- -------------------------------------------------------- +-- +-- Cấu trúc bảng cho bảng `npcs` +-- + +CREATE TABLE `npcs` ( + `id` int(11) NOT NULL, + `server` varchar(50) NOT NULL, + `name` varchar(255) NOT NULL, + `world` varchar(50) NOT NULL, + `x` float NOT NULL, + `y` float NOT NULL, + `z` float NOT NULL, + `yaw` float NOT NULL, + `pitch` float NOT NULL, + `radius` float NOT NULL, + `entityType` varchar(100) NOT NULL, + `entityMeta` varchar(100) NOT NULL, + `adult` bit(1) NOT NULL DEFAULT b'1', + `helmet` blob NOT NULL DEFAULT current_timestamp(), + `chestplate` blob NOT NULL, + `leggings` blob NOT NULL, + `boots` blob NOT NULL, + `inHand` blob NOT NULL, + `info` blob NOT NULL, + `infoRadius` float NOT NULL, + `infoDelay` int(11) NOT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +-- -------------------------------------------------------- + -- -- Cấu trúc bảng cho bảng `playermap` -- @@ -655,7 +575,48 @@ CREATE TABLE `powerplaysubs` ( CREATE TABLE `preferences` ( `accountId` int(11) NOT NULL, - `uuid` varchar(256) NOT NULL + `preference` int(11) NOT NULL, + `value` int(11) NOT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +-- -------------------------------------------------------- + +-- +-- Cấu trúc bảng cho bảng `reporthandlers` +-- + +CREATE TABLE `reporthandlers` ( + `reportId` bigint(20) NOT NULL, + `handlerId` int(11) NOT NULL, + `aborted` tinyint(1) NOT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +-- -------------------------------------------------------- + +-- +-- Cấu trúc bảng cho bảng `reportresults` +-- + +CREATE TABLE `reportresults` ( + `reportId` bigint(20) NOT NULL, + `resultId` int(11) NOT NULL, + `reason` text NOT NULL, + `closedTime` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +-- -------------------------------------------------------- + +-- +-- Cấu trúc bảng cho bảng `reports` +-- + +CREATE TABLE `reports` ( + `id` bigint(20) NOT NULL, + `suspectId` int(11) NOT NULL, + `categoryId` int(11) NOT NULL, + `snapshotId` int(11) NOT NULL, + `assignedTeam` int(11) NOT NULL, + `region` text NOT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -- -------------------------------------------------------- @@ -685,26 +646,7 @@ CREATE TABLE `stats` ( -- INSERT INTO `stats` (`id`, `name`) VALUES -(1, 'Global.TimeInGame'), -(2, 'Global.ExpEarned'), -(3, 'track.warrior'), -(4, 'track.gem-collector'), -(5, 'Bacon Brawl.GemsEarned'), -(6, 'Global.GemsEarned'), -(7, 'Snake.GemsEarned'), -(8, 'Draw My Thing.GemsEarned'), -(9, 'Alien Invasion.GemsEarned'), -(10, 'Runner.GemsEarned'), -(11, 'Sneaky Assassins.GemsEarned'), -(12, 'luckpoints'), -(13, 'luck'), -(14, 'gem-collector'), -(15, 'Dragon Escape.GemsEarned'), -(16, 'Bacon Brawl.TrackWins'), -(17, 'Bacon Brawl.ExpEarned'), -(18, 'Bacon Brawl.Damage Dealt'), -(19, 'Bacon Brawl.Kills'), -(20, 'Bacon Brawl.Wins'); +(1, 'Global.TimeInGame'); -- -------------------------------------------------------- @@ -819,6 +761,12 @@ ALTER TABLE `bonus` ALTER TABLE `communities` ADD PRIMARY KEY (`id`); +-- +-- Chỉ mục cho bảng `forumlink` +-- +ALTER TABLE `forumlink` + ADD PRIMARY KEY (`accountId`); + -- -- Chỉ mục cho bảng `incognitostaff` -- @@ -838,6 +786,12 @@ ALTER TABLE `items` ALTER TABLE `polls` ADD PRIMARY KEY (`id`); +-- +-- Chỉ mục cho bảng `reports` +-- +ALTER TABLE `reports` + ADD PRIMARY KEY (`id`); + -- -- Chỉ mục cho bảng `stats` -- @@ -858,7 +812,7 @@ ALTER TABLE `accountfriend` -- AUTO_INCREMENT cho bảng `accountinventory` -- ALTER TABLE `accountinventory` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; + MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=2; -- -- AUTO_INCREMENT cho bảng `accountpolls` @@ -870,31 +824,31 @@ ALTER TABLE `accountpolls` -- AUTO_INCREMENT cho bảng `accountpunishments` -- ALTER TABLE `accountpunishments` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=3; + MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; -- -- AUTO_INCREMENT cho bảng `accountranks` -- ALTER TABLE `accountranks` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=10; + MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; -- -- AUTO_INCREMENT cho bảng `accounts` -- ALTER TABLE `accounts` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=6; + MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; -- -- AUTO_INCREMENT cho bảng `bonus` -- ALTER TABLE `bonus` - MODIFY `accountId` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=6; + MODIFY `accountId` int(11) NOT NULL AUTO_INCREMENT; -- -- AUTO_INCREMENT cho bảng `communities` -- ALTER TABLE `communities` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=3; + MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; -- -- AUTO_INCREMENT cho bảng `items` @@ -908,11 +862,17 @@ ALTER TABLE `items` ALTER TABLE `polls` MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; +-- +-- AUTO_INCREMENT cho bảng `reports` +-- +ALTER TABLE `reports` + MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT; + -- -- AUTO_INCREMENT cho bảng `stats` -- ALTER TABLE `stats` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=21; + MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=2; -- -- Các ràng buộc cho các bảng đã đổ