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

Rename and clean up MapleMapItem

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:26:48 +02:00
parent 0d13686f07
commit 46842f9890
8 changed files with 81 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java
View File

@@ -36,8 +36,8 @@ import scripting.AbstractPlayerInteraction;
import server.MapleStatEffect;
import server.TimerManager;
import server.life.*;
import server.maps.MapItem;
import server.maps.MapleMap;
import server.maps.MapleMapItem;
import server.maps.MapleMapObject;
import server.maps.MapleMapObjectType;
import tools.PacketCreator;
@@ -153,7 +153,7 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
for (Integer oned : attack.allDamage.keySet()) {
MapleMapObject mapobject = map.getMapObject(oned);
if (mapobject != null && mapobject.getType() == MapleMapObjectType.ITEM) {
final MapleMapItem mapitem = (MapleMapItem) mapobject;
final MapItem mapitem = (MapItem) mapobject;
if (mapitem.getMeso() == 0) { //Maybe it is possible some how?
return;
}

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

@@ -26,7 +26,7 @@ import client.Client;
import client.inventory.Pet;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.maps.MapleMapItem;
import server.maps.MapItem;
import server.maps.MapleMapObject;
import tools.PacketCreator;
@@ -52,7 +52,7 @@ public final class PetLootHandler extends AbstractPacketHandler {
int oid = p.readInt();
MapleMapObject ob = chr.getMap().getMapObject(oid);
try {
MapleMapItem mapitem = (MapleMapItem) ob;
MapItem mapitem = (MapItem) ob;
if (mapitem.getMeso() > 0) {
if (!chr.isEquippedMesoMagnet()) {
c.sendPacket(PacketCreator.enableActions());