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

Rename and clean up MapleMapObjectType

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:31:05 +02:00
parent a979577e5d
commit fa8222d9a0
35 changed files with 132 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,8 +38,8 @@ import server.TimerManager;
import server.life.*;
import server.maps.MapItem;
import server.maps.MapObject;
import server.maps.MapObjectType;
import server.maps.MapleMap;
import server.maps.MapleMapObjectType;
import tools.PacketCreator;
import tools.Pair;
import tools.Randomizer;
@@ -152,7 +152,7 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
int delay = 0;
for (Integer oned : attack.allDamage.keySet()) {
MapObject mapobject = map.getMapObject(oned);
if (mapobject != null && mapobject.getType() == MapleMapObjectType.ITEM) {
if (mapobject != null && mapobject.getType() == MapObjectType.ITEM) {
final MapItem mapitem = (MapItem) mapobject;
if (mapitem.getMeso() == 0) { //Maybe it is possible some how?
return;
@@ -178,7 +178,7 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
} finally {
mapitem.unlockItem();
}
} else if (mapobject != null && mapobject.getType() != MapleMapObjectType.MONSTER) {
} else if (mapobject != null && mapobject.getType() != MapObjectType.MONSTER) {
return;
}
}