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;
}
}

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

@@ -32,7 +32,7 @@ import server.MapleItemInformationProvider;
import server.life.LifeFactory;
import server.life.Monster;
import server.maps.MapObject;
import server.maps.MapleMapObjectType;
import server.maps.MapObjectType;
import server.quest.MapleQuest;
import tools.PacketCreator;
import tools.Randomizer;
@@ -126,7 +126,7 @@ public final class AdminCommandHandler extends AbstractPacketHandler {
case 0x15: // Kill
int mobToKill = p.readInt();
int amount = p.readInt();
List<MapObject> monsterx = c.getPlayer().getMap().getMapObjectsInRange(c.getPlayer().getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.MONSTER));
List<MapObject> monsterx = c.getPlayer().getMap().getMapObjectsInRange(c.getPlayer().getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapObjectType.MONSTER));
for (int x = 0; x < amount; x++) {
Monster monster = (Monster) monsterx.get(x);
if (monster.getId() == mobToKill) {
@@ -147,7 +147,7 @@ public final class AdminCommandHandler extends AbstractPacketHandler {
case 0x18: // Maple & Mobhp
int mobHp = p.readInt();
c.getPlayer().dropMessage("Monsters HP");
List<MapObject> monsters = c.getPlayer().getMap().getMapObjectsInRange(c.getPlayer().getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.MONSTER));
List<MapObject> monsters = c.getPlayer().getMap().getMapObjectsInRange(c.getPlayer().getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapObjectType.MONSTER));
for (MapObject mobs : monsters) {
Monster monster = (Monster) mobs;
if (monster.getId() == mobHp) {

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

@@ -28,7 +28,7 @@ import constants.game.GameConstants;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.maps.MapObject;
import server.maps.MapleMapObjectType;
import server.maps.MapObjectType;
import server.maps.MaplePlayerShop;
import server.maps.MaplePortal;
import tools.PacketCreator;
@@ -47,7 +47,7 @@ public final class HiredMerchantRequest extends AbstractPacketHandler {
Character chr = c.getPlayer();
try {
for (MapObject mmo : chr.getMap().getMapObjectsInRange(chr.getPosition(), 23000, Arrays.asList(MapleMapObjectType.HIRED_MERCHANT, MapleMapObjectType.PLAYER))) {
for (MapObject mmo : chr.getMap().getMapObjectsInRange(chr.getPosition(), 23000, Arrays.asList(MapObjectType.HIRED_MERCHANT, MapObjectType.PLAYER))) {
if (mmo instanceof Character) {
Character mc = (Character) mmo;

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

@@ -30,8 +30,8 @@ import server.life.MobSkillFactory;
import server.life.Monster;
import server.life.MonsterInformationProvider;
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;
@@ -60,7 +60,7 @@ public final class MoveLifeHandler extends AbstractMovementPacketHandler {
int objectid = p.readInt();
short moveid = p.readShort();
MapObject mmo = map.getMapObject(objectid);
if (mmo == null || mmo.getType() != MapleMapObjectType.MONSTER) {
if (mmo == null || mmo.getType() != MapObjectType.MONSTER) {
return;
}

2
src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java
View File

@@ -795,7 +795,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
private static boolean canPlaceStore(Character chr) {
try {
for (MapObject mmo : chr.getMap().getMapObjectsInRange(chr.getPosition(), 23000, Arrays.asList(MapleMapObjectType.HIRED_MERCHANT, MapleMapObjectType.PLAYER))) {
for (MapObject mmo : chr.getMap().getMapObjectsInRange(chr.getPosition(), 23000, Arrays.asList(MapObjectType.HIRED_MERCHANT, MapObjectType.PLAYER))) {
if (mmo instanceof Character) {
Character mc = (Character) mmo;
if (mc.getId() == chr.getId()) {