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

4
src/main/java/client/Character.java
View File

@@ -10065,8 +10065,8 @@ public class Character extends AbstractCharacterObject {
}
@Override
public MapleMapObjectType getType() {
return MapleMapObjectType.PLAYER;
public MapObjectType getType() {
return MapObjectType.PLAYER;
}
@Override

4
src/main/java/client/command/commands/gm2/LootCommand.java
View File

@@ -27,7 +27,7 @@ import client.Client;
import client.command.Command;
import server.maps.MapItem;
import server.maps.MapObject;
import server.maps.MapleMapObjectType;
import server.maps.MapObjectType;
import java.util.Arrays;
import java.util.List;
@@ -40,7 +40,7 @@ public class LootCommand extends Command {
@Override
public void execute(Client c, String[] params) {
List<MapObject> items = c.getPlayer().getMap().getMapObjectsInRange(c.getPlayer().getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.ITEM));
List<MapObject> items = c.getPlayer().getMap().getMapObjectsInRange(c.getPlayer().getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapObjectType.ITEM));
for (MapObject item : items) {
MapItem mapItem = (MapItem) item;
if (mapItem.getOwnerId() == c.getPlayer().getId() || mapItem.getOwnerId() == c.getPlayer().getPartyId()) {

4
src/main/java/client/command/commands/gm3/DebuffCommand.java
View File

@@ -30,7 +30,7 @@ import client.command.Command;
import server.life.MobSkill;
import server.life.MobSkillFactory;
import server.maps.MapObject;
import server.maps.MapleMapObjectType;
import server.maps.MapObjectType;
import java.util.Arrays;
@@ -107,7 +107,7 @@ public class DebuffCommand extends Command {
return;
}
for (MapObject mmo : player.getMap().getMapObjectsInRange(player.getPosition(), 777777.7, Arrays.asList(MapleMapObjectType.PLAYER))) {
for (MapObject mmo : player.getMap().getMapObjectsInRange(player.getPosition(), 777777.7, Arrays.asList(MapObjectType.PLAYER))) {
Character chr = (Character) mmo;
if (chr.getId() != player.getId()) {

4
src/main/java/client/command/commands/gm3/KillAllCommand.java
View File

@@ -28,8 +28,8 @@ import client.Client;
import client.command.Command;
import server.life.Monster;
import server.maps.MapObject;
import server.maps.MapObjectType;
import server.maps.MapleMap;
import server.maps.MapleMapObjectType;
import java.util.Arrays;
import java.util.List;
@@ -43,7 +43,7 @@ public class KillAllCommand extends Command {
public void execute(Client c, String[] params) {
Character player = c.getPlayer();
MapleMap map = player.getMap();
List<MapObject> monsters = map.getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.MONSTER));
List<MapObject> monsters = map.getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapObjectType.MONSTER));
int count = 0;
for (MapObject monstermo : monsters) {
Monster monster = (Monster) monstermo;

4
src/main/java/client/command/commands/gm4/ForceVacCommand.java
View File

@@ -30,7 +30,7 @@ import client.inventory.Pet;
import client.inventory.manipulator.InventoryManipulator;
import server.maps.MapItem;
import server.maps.MapObject;
import server.maps.MapleMapObjectType;
import server.maps.MapObjectType;
import tools.PacketCreator;
import java.util.Arrays;
@@ -44,7 +44,7 @@ public class ForceVacCommand extends Command {
@Override
public void execute(Client c, String[] params) {
Character player = c.getPlayer();
List<MapObject> items = player.getMap().getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.ITEM));
List<MapObject> items = player.getMap().getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapObjectType.ITEM));
for (MapObject item : items) {
MapItem mapItem = (MapItem) item;

4
src/main/java/client/command/commands/gm4/ItemVacCommand.java
View File

@@ -27,7 +27,7 @@ import client.Character;
import client.Client;
import client.command.Command;
import server.maps.MapObject;
import server.maps.MapleMapObjectType;
import server.maps.MapObjectType;
import java.util.Arrays;
import java.util.List;
@@ -40,7 +40,7 @@ public class ItemVacCommand extends Command {
@Override
public void execute(Client c, String[] params) {
Character player = c.getPlayer();
List<MapObject> list = player.getMap().getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.ITEM));
List<MapObject> list = player.getMap().getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapObjectType.ITEM));
for (MapObject item : list) {
player.pickupItem(item);
}

4
src/main/java/client/command/commands/gm5/DebugCommand.java
View File

@@ -31,7 +31,7 @@ import server.TimerManager;
import server.life.Monster;
import server.life.SpawnPoint;
import server.maps.MapObject;
import server.maps.MapleMapObjectType;
import server.maps.MapObjectType;
import server.maps.MaplePortal;
import server.maps.MapleReactor;
@@ -67,7 +67,7 @@ public class DebugCommand extends Command {
break;
case "monster":
List<MapObject> monsters = player.getMap().getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.MONSTER));
List<MapObject> monsters = player.getMap().getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapObjectType.MONSTER));
for (MapObject monstermo : monsters) {
Monster monster = (Monster) monstermo;
Character controller = monster.getController();