Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename and clean up MapleRing

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:23:45 +02:00
parent 8af0999510
commit 448c02033d
5 changed files with 47 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/client/Character.java
View File

@@ -234,11 +234,11 @@ public class Character extends AbstractCharacterObject {
private PartyQuest partyQuest = null;
private final List<Pair<DelayedQuestUpdate, Object[]>> npcUpdateQuests = new LinkedList<>();
private MapleDragon dragon = null;
private MapleRing marriageRing;
private Ring marriageRing;
private int marriageItemid = -1;
private int partnerId = -1;
private final List<MapleRing> crushRings = new ArrayList<>();
private final List<MapleRing> friendshipRings = new ArrayList<>();
private final List<Ring> crushRings = new ArrayList<>();
private final List<Ring> 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<MapleRing> getCrushRings() {
public List<Ring> getCrushRings() {
Collections.sort(crushRings);
return crushRings;
}
@@ -4986,7 +4986,7 @@ public class Character extends AbstractCharacterObject {
usedStorage = true;
}
public List<MapleRing> getFriendshipRings() {
public List<Ring> 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();
}

37
src/main/java/client/MapleRing.java → src/main/java/client/Ring.java
View File

@@ -31,18 +31,17 @@ import java.sql.ResultSet;
import java.sql.SQLException;
/**
*
* @author Danny
*/
public class MapleRing implements Comparable<MapleRing> {
private int ringId;
private int ringId2;
private int partnerId;
private int itemId;
private String partnerName;
public class Ring implements Comparable<Ring> {
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<MapleRing> {
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<MapleRing> {
}
}
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<MapleRing> {
ex.printStackTrace();
}
}
public static Pair<Integer, Integer> createRing(int itemid, final Character partner1, final Character partner2) {
try {
if (partner1 == null) {
@@ -175,12 +174,8 @@ public class MapleRing implements Comparable<MapleRing> {
@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<MapleRing> {
}
@Override
public int compareTo(MapleRing other) {
public int compareTo(Ring other) {
if (ringId < other.getRingId()) {
return -1;
} else if (ringId == other.getRingId()) {