diff --git a/Plugins[Modified]/Mineplex.Core/src/mineplex/core/database/BasicMSSQLProvider.java b/Plugins[Modified]/Mineplex.Core/src/mineplex/core/database/BasicMSSQLProvider.java index f5bd2575..1f85b23f 100644 --- a/Plugins[Modified]/Mineplex.Core/src/mineplex/core/database/BasicMSSQLProvider.java +++ b/Plugins[Modified]/Mineplex.Core/src/mineplex/core/database/BasicMSSQLProvider.java @@ -18,7 +18,7 @@ import mineplex.serverdata.database.DatabaseRunnable; @Deprecated public class BasicMSSQLProvider implements MSSQLProvider { - private final String _webAddress = Constants.WEB_ADDRESS; + public static String _webAddress = Constants.WEB_ADDRESS; // Queue for failed processes private final Object QUEUE_LOCK = new Object(); diff --git a/Plugins[Modified]/Mineplex.Game.Nano/src/mineplex/game/nano/NanoGames.java b/Plugins[Modified]/Mineplex.Game.Nano/src/mineplex/game/nano/NanoGames.java index 8306b6af..ef368043 100644 --- a/Plugins[Modified]/Mineplex.Game.Nano/src/mineplex/game/nano/NanoGames.java +++ b/Plugins[Modified]/Mineplex.Game.Nano/src/mineplex/game/nano/NanoGames.java @@ -2,6 +2,7 @@ package mineplex.game.nano; import static mineplex.core.Managers.require; +import mineplex.core.database.BasicMSSQLProvider; import org.bukkit.Bukkit; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; @@ -99,6 +100,12 @@ public class NanoGames extends JavaPlugin getConfig().addDefault(Constants.WEB_CONFIG_KEY, Constants.WEB_ADDRESS); getConfig().set(Constants.WEB_CONFIG_KEY, getConfig().getString(Constants.WEB_CONFIG_KEY)); saveConfig(); + + Bukkit.getWorld("world").getEntities().forEach(entity -> { + entity.remove(); + }); + + BasicMSSQLProvider._webAddress = getConfig().getString(Constants.WEB_CONFIG_KEY); require(ProfileCacheManager.class); CommandCenter.Initialize(this); @@ -154,7 +161,7 @@ public class NanoGames extends JavaPlugin new MessageManager(this, incognito, clientManager, preferenceManager, ignoreManager, punish, friendManager, require(Chat.class)); new MemoryFix(this); new MenuManager(this); - new FileUpdater(GenericServer.HUB); + //new FileUpdater(GenericServer.HUB); new CustomTagFix(this, packetHandler); new PacketsInteractionFix(this, packetHandler); diff --git a/Plugins[Modified]/Mineplex.Hub/src/mineplex/hub/Hub.java b/Plugins[Modified]/Mineplex.Hub/src/mineplex/hub/Hub.java index ddcf47d5..b70cee97 100644 --- a/Plugins[Modified]/Mineplex.Hub/src/mineplex/hub/Hub.java +++ b/Plugins[Modified]/Mineplex.Hub/src/mineplex/hub/Hub.java @@ -1,5 +1,6 @@ package mineplex.hub; +import mineplex.core.database.BasicMSSQLProvider; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; @@ -92,6 +93,13 @@ public class Hub extends JavaPlugin implements IRelation getConfig().addDefault(Constants.WEB_CONFIG_KEY, Constants.WEB_ADDRESS); getConfig().set(Constants.WEB_CONFIG_KEY, getConfig().getString(Constants.WEB_CONFIG_KEY)); saveConfig(); + + Bukkit.getWorld("world").getEntities().forEach(entity -> { + entity.remove(); + }); + + //workaround: i have no way of doing this better + BasicMSSQLProvider._webAddress = getConfig().getString(Constants.WEB_CONFIG_KEY); //Static Modules require(ProfileCacheManager.class); diff --git a/Plugins[Modified]/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java b/Plugins[Modified]/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java index ac90c08b..3ce767df 100644 --- a/Plugins[Modified]/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java +++ b/Plugins[Modified]/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java @@ -2,6 +2,7 @@ package mineplex.staffServer; import java.util.UUID; +import mineplex.core.database.BasicMSSQLProvider; import net.minecraft.server.v1_8_R3.MinecraftServer; import org.bukkit.Bukkit; @@ -50,6 +51,12 @@ public class StaffServer extends JavaPlugin getConfig().set(Constants.WEB_CONFIG_KEY, getConfig().getString(Constants.WEB_CONFIG_KEY)); saveConfig(); + Bukkit.getWorld("world").getEntities().forEach(entity -> { + entity.remove(); + }); + + BasicMSSQLProvider._webAddress = getConfig().getString(Constants.WEB_CONFIG_KEY); + //Static Modules CommandCenter.Initialize(this); CoreClientManager clientManager = new CoreClientManager(this); @@ -70,7 +77,7 @@ public class StaffServer extends JavaPlugin BonusRepository bonusRepository = new BonusRepository(this, null, donationManager); new AchievementManager(statsManager, clientManager, donationManager, null, eloManager); new MemoryFix(this); - new FileUpdater(GenericServer.HUB); + //new FileUpdater(GenericServer.HUB); require(PacketHandler.class); require(DisguiseManager.class); 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 3efd22e5..fa81b028 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 @@ -3,6 +3,7 @@ package nautilus.game.arcade; import java.io.File; //import mineplex.core.TwitchIntegrationFix; +import mineplex.core.database.BasicMSSQLProvider; import net.minecraft.server.v1_8_R3.MinecraftServer; import org.bukkit.Bukkit; @@ -106,6 +107,10 @@ public class Arcade extends JavaPlugin }, this, ServicePriority.Normal); */ Bukkit.setSpawnRadius(0); + Bukkit.getWorld("world").getEntities().forEach(entity -> { + entity.remove(); + }); + //Delete Old Games Folders DeleteFolders(); @@ -114,6 +119,9 @@ public class Arcade extends JavaPlugin getConfig().set(Constants.WEB_CONFIG_KEY, getConfig().getString(Constants.WEB_CONFIG_KEY)); saveConfig(); + //workaround: i have no way of doing this better + BasicMSSQLProvider._webAddress = getConfig().getString(Constants.WEB_CONFIG_KEY); + //Logger.initialize(this); //Static Modules diff --git a/sql_dumps/account.sql b/sql_dumps/account.sql index f7c565e3..55d5e1ca 100644 --- a/sql_dumps/account.sql +++ b/sql_dumps/account.sql @@ -723,6 +723,40 @@ CREATE TABLE `youtube` ( `clicktime` int(11) NOT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; +-- +-- Table structure for table `salesannouncements` +-- + +CREATE TABLE `salesannouncements` ( + `id` int(11) NOT NULL, + `ranks` varchar(250) DEFAULT NULL, + `message` varchar(256) DEFAULT NULL, + `enabled` tinyint(1) DEFAULT NULL, + `clans` tinyint(1) DEFAULT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +-- +-- Indexes for dumped tables +-- + +-- +-- Indexes for table `salesannouncements` +-- +ALTER TABLE `salesannouncements` + ADD PRIMARY KEY (`id`), + ADD KEY `typeIndex` (`clans`); + +-- +-- AUTO_INCREMENT for dumped tables +-- + +-- +-- AUTO_INCREMENT for table `salesannouncements` +-- +ALTER TABLE `salesannouncements` + MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; +COMMIT; + -- -- Indexes for dumped tables --