From 0e276474c57582d2396b71765e13588681599cca Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 11 Mar 2016 02:20:18 +0000 Subject: [PATCH] fixerroooniissssss --- .../repository/IncognitoRepository.java | 17 +++-------------- .../src/mineplex/game/clans/Clans.java | 2 +- .../game/clans/clans/siege/SiegeManager.java | 6 ------ 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/incognito/repository/IncognitoRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/incognito/repository/IncognitoRepository.java index a7fa15e46..a843aeae7 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/incognito/repository/IncognitoRepository.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/incognito/repository/IncognitoRepository.java @@ -1,13 +1,11 @@ package mineplex.core.incognito.repository; -import mineplex.cache.player.PlayerCache; import mineplex.core.account.CoreClientManager; import mineplex.core.common.util.EnclosedObject; import mineplex.core.common.util.UUIDFetcher; import mineplex.core.database.MinecraftRepository; import mineplex.core.incognito.IncognitoManager; import mineplex.serverdata.database.DBPool; -import mineplex.serverdata.database.column.ColumnBoolean; import mineplex.serverdata.database.column.ColumnInt; public class IncognitoRepository extends MinecraftRepository @@ -32,7 +30,7 @@ public class IncognitoRepository extends MinecraftRepository public void SetStatus(int accountId, boolean status) { System.out.println("[INCOGNITO] Updated status for " + accountId + " to " + status); - executeUpdate(SET_STATUS, new ColumnInt("accountId", accountId), new ColumnBoolean("status", status)); + executeUpdate(SET_STATUS, new ColumnInt("accountId", accountId), new ColumnInt("status", status ? 1 : 0)); } public boolean GetStatus(int accountId) @@ -41,7 +39,7 @@ public class IncognitoRepository extends MinecraftRepository executeQuery(GET_STATUS, result -> { if (result.next()) - status.Set(Boolean.valueOf(result.getBoolean("accountId"))); + status.Set(result.getInt("status") == 1 ? Boolean.TRUE : Boolean.FALSE); else status.Set(Boolean.FALSE); }, new ColumnInt("accountId", accountId)); @@ -57,16 +55,7 @@ public class IncognitoRepository extends MinecraftRepository accountId.Set(id) ); - EnclosedObject status = new EnclosedObject<>(); - - executeQuery(GET_STATUS, result -> { - if (result.next()) - status.Set(Boolean.valueOf(result.getBoolean("accountId"))); - else - status.Set(Boolean.FALSE); - }, new ColumnInt("accountId", accountId.Get().intValue())); - - return status.Get().booleanValue(); + return GetStatus(accountId.Get().intValue()); } protected void initialize() diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java index 053fac006..3297974c5 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java @@ -127,7 +127,7 @@ public class Clans extends JavaPlugin new FriendManager(this, _clientManager, preferenceManager, portal); new InventoryManager(this, _clientManager); ResourcePackManager resourcePackManager = new ResourcePackManager(this, portal); - resourcePackManager.setResourcePack("http://b.garblox.com/CLANS_BETA_PACK_V5.zip", true); + resourcePackManager.setResourcePack("http://b.garblox.com/CLANS_BETA_PACK_V6.zip", true); // Enable custom-gear related managers new CustomTagFix(this, packetHandler); diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/SiegeManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/SiegeManager.java index e328bdaad..5fa6e48b4 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/SiegeManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/SiegeManager.java @@ -65,12 +65,6 @@ public class SiegeManager extends MiniPlugin }); } - @EventHandler - public void join(PlayerJoinEvent event) - { - event.getPlayer().getWorld().getEntitiesByClass(Slime.class).forEach(Entity::remove); - } - @EventHandler public void save(UpdateEvent event) {