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

4
src/main/java/server/life/positioner/PlayerNPCPodium.java
View File

@@ -24,8 +24,8 @@ import net.server.Server;
import net.server.channel.Channel;
import server.life.PlayerNPC;
import server.maps.MapObject;
import server.maps.MapObjectType;
import server.maps.MapleMap;
import server.maps.MapleMapObjectType;
import tools.PacketCreator;
import java.awt.*;
@@ -128,7 +128,7 @@ public class PlayerNPCPodium {
return null;
}
List<MapObject> mmoList = map.getMapObjectsInRange(new Point(0, 0), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.PLAYER_NPC));
List<MapObject> mmoList = map.getMapObjectsInRange(new Point(0, 0), Double.POSITIVE_INFINITY, Arrays.asList(MapObjectType.PLAYER_NPC));
map.getWorldServer().setPlayerNpcMapPodiumData(map.getId(), encodePodiumData(podiumStep + 1, podiumCount + 1));
return reorganizePlayerNpcs(map, podiumStep + 1, mmoList);
} else {

4
src/main/java/server/life/positioner/PlayerNPCPositioner.java
View File

@@ -24,8 +24,8 @@ import net.server.Server;
import net.server.channel.Channel;
import server.life.PlayerNPC;
import server.maps.MapObject;
import server.maps.MapObjectType;
import server.maps.MapleMap;
import server.maps.MapleMapObjectType;
import tools.PacketCreator;
import java.awt.*;
@@ -176,7 +176,7 @@ public class PlayerNPCPositioner {
}
private static Point getNextPlayerNpcPosition(MapleMap map, int initStep) { // automated playernpc position thanks to Ronan
List<MapObject> mmoList = map.getMapObjectsInRange(new Point(0, 0), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.PLAYER_NPC));
List<MapObject> mmoList = map.getMapObjectsInRange(new Point(0, 0), Double.POSITIVE_INFINITY, Arrays.asList(MapObjectType.PLAYER_NPC));
List<Point> otherPlayerNpcs = new LinkedList<>();
for (MapObject mmo : mmoList) {
otherPlayerNpcs.add(mmo.getPosition());