Sweetgum/sweetgum-server
1
0
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

18
src/main/java/net/server/channel/handlers/PetLootHandler.java
View File

@@ -21,17 +21,17 @@
*/
package net.server.channel.handlers;
import java.util.Set;
import client.MapleCharacter;
import client.MapleClient;
import client.inventory.MaplePet;
import net.AbstractMaplePacketHandler;
import server.maps.MapleMapItem;
import server.maps.MapleMapObject;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import java.util.Set;
/**
* @author TheRamon
* @author Ronan
@@ -44,7 +44,7 @@ public final class PetLootHandler extends AbstractMaplePacketHandler {
int petIndex = chr.getPetIndex(slea.readInt());
MaplePet pet = chr.getPet(petIndex);
if (pet == null || !pet.isSummoned()) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
@@ -55,27 +55,27 @@ public final class PetLootHandler extends AbstractMaplePacketHandler {
MapleMapItem mapitem = (MapleMapItem) ob;
if (mapitem.getMeso() > 0) {
if (!chr.isEquippedMesoMagnet()) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
if (chr.isEquippedPetItemIgnore()) {
final Set<Integer> petIgnore = chr.getExcludedItems();
if(!petIgnore.isEmpty() && petIgnore.contains(Integer.MAX_VALUE)) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
}
} else {
if (!chr.isEquippedItemPouch()) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
if (chr.isEquippedPetItemIgnore()) {
final Set<Integer> petIgnore = chr.getExcludedItems();
if(!petIgnore.isEmpty() && petIgnore.contains(mapitem.getItem().getItemId())) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
}
@@ -83,7 +83,7 @@ public final class PetLootHandler extends AbstractMaplePacketHandler {
chr.pickupItem(ob, petIndex);
} catch (NullPointerException | ClassCastException e) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
}
}
}