From 138a4cf6380316ff60ca9d51defcd1a72f18449a Mon Sep 17 00:00:00 2001 From: Ty Sayers Date: Sat, 29 Aug 2015 17:43:12 -0700 Subject: [PATCH] Fix bug where transferring a clan to destination server would not load properly server-side. --- .../clans/core/repository/ClanRepository.java | 35 +++++++++---------- .../src/mineplex/hub/server/ui/LobbyShop.java | 4 +-- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/ClanRepository.java b/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/ClanRepository.java index 64f256ce2..ecd1f0030 100644 --- a/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/ClanRepository.java +++ b/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/ClanRepository.java @@ -73,7 +73,7 @@ public class ClanRepository extends RepositoryBase private static String UPDATE_CLAN_SERVER_ID = "UPDATE clans SET serverId = ?, home = '', generator = '' WHERE id = ?;"; private static String UPDATE_CLAN_GENERATOR = "UPDATE clans SET generator = ?, generatorStock = ? WHERE id = ?;"; - private static String GET_CLAN_SERVER = "SELECT id FROM clanServer WHERE clanServer.serverName = ?"; + private static String GET_CLAN_SERVER = "SELECT id FROM clanServer WHERE clanServer.serverName = ?"; private static String ADD_CLAN_SERVER = "INSERT INTO clanServer (serverName) VALUES (?);"; private String _serverName; @@ -175,24 +175,21 @@ public class ClanRepository extends RepositoryBase { if (resultSet.next()) { - if (resultSet.next()) - { - clan.Id = resultSet.getInt(1); - clan.Name = resultSet.getString(2); - clan.Description = resultSet.getString(3); - clan.Home = resultSet.getString(4); - clan.Admin = resultSet.getBoolean(5); - clan.Energy = resultSet.getInt(6); - clan.Kills = resultSet.getInt(7); - clan.Murder = resultSet.getInt(8); - clan.Deaths = resultSet.getInt(9); - clan.WarWins = resultSet.getInt(10); - clan.WarLosses = resultSet.getInt(11); - clan.Generator = resultSet.getString(12); - clan.GeneratorStock = resultSet.getInt(13); - clan.DateCreated = resultSet.getTimestamp(14); - clan.LastOnline = resultSet.getTimestamp(15); - } + clan.Id = resultSet.getInt(1); + clan.Name = resultSet.getString(2); + clan.Description = resultSet.getString(3); + clan.Home = resultSet.getString(4); + clan.Admin = resultSet.getBoolean(5); + clan.Energy = resultSet.getInt(6); + clan.Kills = resultSet.getInt(7); + clan.Murder = resultSet.getInt(8); + clan.Deaths = resultSet.getInt(9); + clan.WarWins = resultSet.getInt(10); + clan.WarLosses = resultSet.getInt(11); + clan.Generator = resultSet.getString(12); + clan.GeneratorStock = resultSet.getInt(13); + clan.DateCreated = resultSet.getTimestamp(14); + clan.LastOnline = resultSet.getTimestamp(15); } } }, new ColumnVarChar("name", 100, clanName.toLowerCase())); diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyShop.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyShop.java index dc7f9477e..0f72b00b7 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyShop.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyShop.java @@ -24,11 +24,11 @@ public class LobbyShop extends ShopBase return new LobbyMenu(getPlugin(), this, getClientManager(), getDonationManager(), " " + ChatColor.UNDERLINE + "Lobby Selector", player, "Lobby"); } - public void UpdatePages() + public void UpdatePages() { for (ShopPageBase> page : getPlayerPageMap().values()) { - if (page instanceof LobbyMenu) + if (page instanceof LobbyMenu) { ((LobbyMenu)page).Update(); }