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

Remove "Maple" prefix from MaplePacketCreator name

Browse Source
This commit is contained in:
P0nk
2021-08-19 21:31:57 +02:00
parent 579e3c639f
commit e184f25184
307 changed files with 2285 additions and 2328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,7 @@ import net.server.world.World;
import scripting.event.EventInstanceManager;
import server.MapleItemInformationProvider;
import tools.DatabaseConnection;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Pair;
import tools.data.input.SeekableLittleEndianAccessor;
import tools.packets.Wedding;
@@ -315,20 +315,20 @@ public final class RingActionHandler extends AbstractMaplePacketHandler {
final MapleCharacter target = c.getPlayer();
if (source == null) {
target.announce(MaplePacketCreator.enableActions());
target.announce(PacketCreator.enableActions());
return;
}
final int itemid = source.getMarriageItemId();
if (target.getPartnerId() > 0 || source.getId() != id || itemid <= 0 || !source.haveItem(itemid) || source.getPartnerId() > 0 || !source.isAlive() || !target.isAlive()) {
target.announce(MaplePacketCreator.enableActions());
target.announce(PacketCreator.enableActions());
return;
}
if (accepted) {
final int newItemId = getBoxId(itemid);
if (!MapleInventoryManipulator.checkSpace(c, newItemId, 1, "") || !MapleInventoryManipulator.checkSpace(source.getClient(), newItemId, 1, "")) {
target.announce(MaplePacketCreator.enableActions());
target.announce(PacketCreator.enableActions());
return;
}
@@ -374,12 +374,12 @@ public final class RingActionHandler extends AbstractMaplePacketHandler {
try {
itemId = c.getPlayer().getInventory(MapleInventoryType.ETC).getItem(slot).getItemId();
} catch(NullPointerException npe) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
if((itemId != 4031377 && itemId != 4031395) || !c.getPlayer().haveItem(itemId)) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
@@ -444,7 +444,7 @@ public final class RingActionHandler extends AbstractMaplePacketHandler {
if(invitationid == 4031406 || invitationid == 4031407) {
Item item = c.getPlayer().getInventory(MapleInventoryType.ETC).getItem(slot);
if(item == null || item.getItemId() != invitationid) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
@@ -502,6 +502,6 @@ public final class RingActionHandler extends AbstractMaplePacketHandler {
break;
}
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
}
}