JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #51 in MIN/mineplex from clans_custom_gear to clans-beta 

* commit '138a4cf6380316ff60ca9d51defcd1a72f18449a':
  Fix bug where transferring a clan to destination server would not load properly server-side.
This commit is contained in:
Ty Sayers 2015-08-29 19:43:31 -05:00
parent 7284093786 138a4cf638
commit 8c509c5bd1
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/ClanRepository.java
View File

@ -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()));

4
Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyShop.java
View File

@ -24,11 +24,11 @@ public class LobbyShop extends ShopBase<ServerManager>
return new LobbyMenu(getPlugin(), this, getClientManager(), getDonationManager(), " " + ChatColor.UNDERLINE + "Lobby Selector", player, "Lobby");
}
public void UpdatePages()
public void UpdatePages()
{
for (ShopPageBase<ServerManager, ? extends ShopBase<ServerManager>> page : getPlayerPageMap().values())
{
if (page instanceof LobbyMenu)
if (page instanceof LobbyMenu)
{
((LobbyMenu)page).Update();
}