diff --git a/src/main/java/client/Character.java b/src/main/java/client/Character.java index e534a078ab..2d41aa94ed 100644 --- a/src/main/java/client/Character.java +++ b/src/main/java/client/Character.java @@ -7406,6 +7406,9 @@ public class Character extends AbstractCharacterObject { ret.buddylist.loadFromDb(charid); ret.storage = wserv.getAccountStorage(ret.accountid); + /* Double-check storage incase player is first time on server + * The storage won't exist so nothing to load + */ if(ret.storage == null) { wserv.loadAccountStorage(ret.accountid); ret.storage = wserv.getAccountStorage(ret.accountid); diff --git a/src/main/java/net/server/channel/handlers/BBSOperationHandler.java b/src/main/java/net/server/channel/handlers/BBSOperationHandler.java index b8b17ed0ed..06031e5cdc 100644 --- a/src/main/java/net/server/channel/handlers/BBSOperationHandler.java +++ b/src/main/java/net/server/channel/handlers/BBSOperationHandler.java @@ -318,9 +318,6 @@ public final class BBSOperationHandler extends AbstractPacketHandler { } client.sendPacket(GuildPackets.showThread(bIsThreadIdLocal ? threadid : threadRS.getInt("localthreadid"), threadRS, repliesRS)); } - /* repliesRS.close(); - * Don't need because ResultSet will be closed - * when associated Statement close*/ } } catch (SQLException se) { log.error("Error displaying thread", se); diff --git a/src/main/java/net/server/channel/handlers/MTSHandler.java b/src/main/java/net/server/channel/handlers/MTSHandler.java index 32ed63e8fa..ca00cc842f 100644 --- a/src/main/java/net/server/channel/handlers/MTSHandler.java +++ b/src/main/java/net/server/channel/handlers/MTSHandler.java @@ -359,7 +359,6 @@ public final class MTSHandler extends AbstractPacketHandler { c.sendPacket(PacketCreator.MTSConfirmTransfer(i.getQuantity(), i.getPosition())); c.sendPacket(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); } - // rs.close(); Closing statement will also close related resultset } } catch (SQLException e) { log.error("MTS Transfer error", e);