diff --git a/src/main/java/client/Character.java b/src/main/java/client/Character.java index 2460f768a2..4d649080ce 100644 --- a/src/main/java/client/Character.java +++ b/src/main/java/client/Character.java @@ -234,11 +234,11 @@ public class Character extends AbstractCharacterObject { private PartyQuest partyQuest = null; private final List> npcUpdateQuests = new LinkedList<>(); private MapleDragon dragon = null; - private MapleRing marriageRing; + private Ring marriageRing; private int marriageItemid = -1; private int partnerId = -1; - private final List crushRings = new ArrayList<>(); - private final List friendshipRings = new ArrayList<>(); + private final List crushRings = new ArrayList<>(); + private final List friendshipRings = new ArrayList<>(); private boolean loggedIn = false; private boolean useCS; //chaos scroll upon crafting item. private long npcCd; @@ -524,17 +524,17 @@ public class Character extends AbstractCharacterObject { } } - public void addCrushRing(MapleRing r) { + public void addCrushRing(Ring r) { crushRings.add(r); } - public MapleRing getRingById(int id) { - for (MapleRing ring : getCrushRings()) { + public Ring getRingById(int id) { + for (Ring ring : getCrushRings()) { if (ring.getRingId() == id) { return ring; } } - for (MapleRing ring : getFriendshipRings()) { + for (Ring ring : getFriendshipRings()) { if (ring.getRingId() == id) { return ring; } @@ -602,11 +602,11 @@ public class Character extends AbstractCharacterObject { this.fame += famechange; } - public void addFriendshipRing(MapleRing r) { + public void addFriendshipRing(Ring r) { friendshipRings.add(r); } - public void addMarriageRing(MapleRing r) { + public void addMarriageRing(Ring r) { marriageRing = r; } @@ -4639,7 +4639,7 @@ public class Character extends AbstractCharacterObject { return Collections.unmodifiableList(ret); } - public List getCrushRings() { + public List getCrushRings() { Collections.sort(crushRings); return crushRings; } @@ -4986,7 +4986,7 @@ public class Character extends AbstractCharacterObject { usedStorage = true; } - public List getFriendshipRings() { + public List getFriendshipRings() { Collections.sort(friendshipRings); return friendshipRings; } @@ -5193,7 +5193,7 @@ public class Character extends AbstractCharacterObject { return mapid; } - public MapleRing getMarriageRing() { + public Ring getMarriageRing() { return partnerId > 0 ? marriageRing : null; } @@ -6829,7 +6829,7 @@ public class Character extends AbstractCharacterObject { } } - public void addPlayerRing(MapleRing ring) { + public void addPlayerRing(Ring ring) { int ringItemId = ring.getItemId(); if (ItemConstants.isWeddingRing(ringItemId)) { this.addMarriageRing(ring); @@ -7060,7 +7060,7 @@ public class Character extends AbstractCharacterObject { if (mit.equals(InventoryType.EQUIP) || mit.equals(InventoryType.EQUIPPED)) { Equip equip = (Equip) item.getLeft(); if (equip.getRingId() > -1) { - MapleRing ring = MapleRing.loadFromDb(equip.getRingId()); + Ring ring = Ring.loadFromDb(equip.getRingId()); if (item.getRight().equals(InventoryType.EQUIPPED)) { ring.equip(); } diff --git a/src/main/java/client/MapleRing.java b/src/main/java/client/Ring.java similarity index 87% rename from src/main/java/client/MapleRing.java rename to src/main/java/client/Ring.java index 6565fc9e9a..2219f41db9 100644 --- a/src/main/java/client/MapleRing.java +++ b/src/main/java/client/Ring.java @@ -31,18 +31,17 @@ import java.sql.ResultSet; import java.sql.SQLException; /** - * * @author Danny */ -public class MapleRing implements Comparable { - private int ringId; - private int ringId2; - private int partnerId; - private int itemId; - private String partnerName; +public class Ring implements Comparable { + private final int ringId; + private final int ringId2; + private final int partnerId; + private final int itemId; + private final String partnerName; private boolean equipped = false; - public MapleRing(int id, int id2, int partnerId, int itemid, String partnername) { + public Ring(int id, int id2, int partnerId, int itemid, String partnername) { this.ringId = id; this.ringId2 = id2; this.partnerId = partnerId; @@ -50,15 +49,15 @@ public class MapleRing implements Comparable { this.partnerName = partnername; } - public static MapleRing loadFromDb(int ringId) { - MapleRing ret = null; + public static Ring loadFromDb(int ringId) { + Ring ret = null; try (Connection con = DatabaseConnection.getConnection(); PreparedStatement ps = con.prepareStatement("SELECT * FROM rings WHERE id = ?")) { ps.setInt(1, ringId); try (ResultSet rs = ps.executeQuery()) { if (rs.next()) { - ret = new MapleRing(ringId, rs.getInt("partnerRingId"), rs.getInt("partnerChrId"), rs.getInt("itemid"), rs.getString("partnerName")); + ret = new Ring(ringId, rs.getInt("partnerRingId"), rs.getInt("partnerChrId"), rs.getInt("itemid"), rs.getString("partnerName")); } } return ret; @@ -68,12 +67,12 @@ public class MapleRing implements Comparable { } } - public static void removeRing(final MapleRing ring) { + public static void removeRing(final Ring ring) { try { if (ring == null) { return; } - + try (Connection con = DatabaseConnection.getConnection()) { try (PreparedStatement ps = con.prepareStatement("DELETE FROM rings WHERE id=?")) { ps.setInt(1, ring.getRingId()); @@ -102,7 +101,7 @@ public class MapleRing implements Comparable { ex.printStackTrace(); } } - + public static Pair createRing(int itemid, final Character partner1, final Character partner2) { try { if (partner1 == null) { @@ -175,12 +174,8 @@ public class MapleRing implements Comparable { @Override public boolean equals(Object o) { - if (o instanceof MapleRing) { - if (((MapleRing) o).getRingId() == getRingId()) { - return true; - } else { - return false; - } + if (o instanceof Ring) { + return ((Ring) o).getRingId() == getRingId(); } return false; } @@ -193,7 +188,7 @@ public class MapleRing implements Comparable { } @Override - public int compareTo(MapleRing other) { + public int compareTo(Ring other) { if (ringId < other.getRingId()) { return -1; } else if (ringId == other.getRingId()) { diff --git a/src/main/java/net/server/channel/handlers/CashOperationHandler.java b/src/main/java/net/server/channel/handlers/CashOperationHandler.java index c1494e1dd2..a1bdb72356 100644 --- a/src/main/java/net/server/channel/handlers/CashOperationHandler.java +++ b/src/main/java/net/server/channel/handlers/CashOperationHandler.java @@ -23,7 +23,7 @@ package net.server.channel.handlers; import client.Character; import client.Client; -import client.MapleRing; +import client.Ring; import client.inventory.Equip; import client.inventory.Inventory; import client.inventory.InventoryType; @@ -265,7 +265,7 @@ public final class CashOperationHandler extends AbstractPacketHandler { if(item instanceof Equip) { Equip equip = (Equip) item; if(equip.getRingId() >= 0) { - MapleRing ring = MapleRing.loadFromDb(equip.getRingId()); + Ring ring = Ring.loadFromDb(equip.getRingId()); chr.addPlayerRing(ring); } } @@ -318,13 +318,13 @@ public final class CashOperationHandler extends AbstractPacketHandler { if(itemRing.toItem() instanceof Equip) { Equip eqp = (Equip) itemRing.toItem(); - Pair rings = MapleRing.createRing(itemRing.getItemId(), chr, partner); + Pair rings = Ring.createRing(itemRing.getItemId(), chr, partner); eqp.setRingId(rings.getLeft()); cs.addToInventory(eqp); c.sendPacket(PacketCreator.showBoughtCashItem(eqp, c.getAccID())); cs.gainCash(toCharge, itemRing, chr.getWorld()); cs.gift(partner.getId(), chr.getName(), text, eqp.getSN(), rings.getRight()); - chr.addCrushRing(MapleRing.loadFromDb(rings.getLeft())); + chr.addCrushRing(Ring.loadFromDb(rings.getLeft())); try { chr.sendNote(partner.getName(), text, (byte) 1); } catch (SQLException ex) { @@ -382,13 +382,13 @@ public final class CashOperationHandler extends AbstractPacketHandler { // Need to check to make sure its actually an equip and the right SN... if(itemRing.toItem() instanceof Equip) { Equip eqp = (Equip) itemRing.toItem(); - Pair rings = MapleRing.createRing(itemRing.getItemId(), chr, partner); + Pair rings = Ring.createRing(itemRing.getItemId(), chr, partner); eqp.setRingId(rings.getLeft()); cs.addToInventory(eqp); c.sendPacket(PacketCreator.showBoughtCashRing(eqp, partner.getName(), c.getAccID())); cs.gainCash(payment, -itemRing.getPrice()); cs.gift(partner.getId(), chr.getName(), text, eqp.getSN(), rings.getRight()); - chr.addFriendshipRing(MapleRing.loadFromDb(rings.getLeft())); + chr.addFriendshipRing(Ring.loadFromDb(rings.getLeft())); try { chr.sendNote(partner.getName(), text, (byte) 1); } catch (SQLException ex) { diff --git a/src/main/java/net/server/channel/handlers/RingActionHandler.java b/src/main/java/net/server/channel/handlers/RingActionHandler.java index bffcb4d9e3..c9b971883d 100644 --- a/src/main/java/net/server/channel/handlers/RingActionHandler.java +++ b/src/main/java/net/server/channel/handlers/RingActionHandler.java @@ -23,7 +23,7 @@ package net.server.channel.handlers; import client.Character; import client.Client; -import client.MapleRing; +import client.Ring; import client.inventory.Equip; import client.inventory.InventoryType; import client.inventory.Item; @@ -176,7 +176,7 @@ public final class RingActionHandler extends AbstractPacketHandler { if(partnerid <= 0) return; chr.getClient().getWorldServer().deleteRelationship(chr.getId(), partnerid); - MapleRing.removeRing(chr.getMarriageRing()); + Ring.removeRing(chr.getMarriageRing()); Character partner = chr.getClient().getWorldServer().getPlayerStorage().getCharacterById(partnerid); if(partner == null) { @@ -272,20 +272,20 @@ public final class RingActionHandler extends AbstractPacketHandler { } public static void giveMarriageRings(Character player, Character partner, int marriageRingId) { - Pair rings = MapleRing.createRing(marriageRingId, player, partner); + Pair rings = Ring.createRing(marriageRingId, player, partner); MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); Item ringObj = ii.getEquipById(marriageRingId); Equip ringEqp = (Equip) ringObj; ringEqp.setRingId(rings.getLeft()); - player.addMarriageRing(MapleRing.loadFromDb(rings.getLeft())); + player.addMarriageRing(Ring.loadFromDb(rings.getLeft())); InventoryManipulator.addFromDrop(player.getClient(), ringEqp, false, -1); player.broadcastMarriageMessage(); ringObj = ii.getEquipById(marriageRingId); ringEqp = (Equip) ringObj; ringEqp.setRingId(rings.getRight()); - partner.addMarriageRing(MapleRing.loadFromDb(rings.getRight())); + partner.addMarriageRing(Ring.loadFromDb(rings.getRight())); InventoryManipulator.addFromDrop(partner.getClient(), ringEqp, false, -1); partner.broadcastMarriageMessage(); } diff --git a/src/main/java/tools/PacketCreator.java b/src/main/java/tools/PacketCreator.java index 47abfb066b..db68fc1855 100644 --- a/src/main/java/tools/PacketCreator.java +++ b/src/main/java/tools/PacketCreator.java @@ -2081,14 +2081,14 @@ public class PacketCreator { } private static void addRingLook(final OutPacket p, Character chr, boolean crush) { - List rings; + List rings; if (crush) { rings = chr.getCrushRings(); } else { rings = chr.getFriendshipRings(); } boolean yes = false; - for (MapleRing ring : rings) { + for (Ring ring : rings) { if (ring.equipped()) { if (yes == false) { yes = true; @@ -2107,7 +2107,7 @@ public class PacketCreator { } private static void addMarriageRingLook(Client target, final OutPacket p, Character chr) { - MapleRing ring = chr.getMarriageRing(); + Ring ring = chr.getMarriageRing(); if (ring == null || !ring.equipped()) { p.writeByte(0); @@ -6712,7 +6712,7 @@ public class PacketCreator { private static void addRingInfo(OutPacket p, Character chr) { p.writeShort(chr.getCrushRings().size()); - for (MapleRing ring : chr.getCrushRings()) { + for (Ring ring : chr.getCrushRings()) { p.writeInt(ring.getPartnerChrId()); p.writeFixedString(getRightPaddedStr(ring.getPartnerName(), '\0', 13)); p.writeInt(ring.getRingId()); @@ -6721,7 +6721,7 @@ public class PacketCreator { p.writeInt(0); } p.writeShort(chr.getFriendshipRings().size()); - for (MapleRing ring : chr.getFriendshipRings()) { + for (Ring ring : chr.getFriendshipRings()) { p.writeInt(ring.getPartnerChrId()); p.writeFixedString(getRightPaddedStr(ring.getPartnerName(), '\0', 13)); p.writeInt(ring.getRingId()); @@ -6732,7 +6732,7 @@ public class PacketCreator { } if (chr.getPartnerId() > 0) { - MapleRing marriageRing = chr.getMarriageRing(); + Ring marriageRing = chr.getMarriageRing(); p.writeShort(1); p.writeInt(chr.getRelationshipId());