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
commit 8c509c5bd1
2 changed files with 18 additions and 21 deletions

View File

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