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

12
src/main/java/net/server/channel/handlers/CashOperationHandler.java
View File

@@ -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<Integer, Integer> rings = MapleRing.createRing(itemRing.getItemId(), chr, partner);
Pair<Integer, Integer> 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<Integer, Integer> rings = MapleRing.createRing(itemRing.getItemId(), chr, partner);
Pair<Integer, Integer> 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) {

10
src/main/java/net/server/channel/handlers/RingActionHandler.java
View File

@@ -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<Integer, Integer> rings = MapleRing.createRing(marriageRingId, player, partner);
Pair<Integer, Integer> 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();
}