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

Rename and clean up MapleMapObject

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:29:01 +02:00
parent e917980a39
commit a979577e5d
33 changed files with 185 additions and 185 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

@@ -37,8 +37,8 @@ import server.MapleStatEffect;
import server.TimerManager;
import server.life.*;
import server.maps.MapItem;
import server.maps.MapObject;
import server.maps.MapleMap;
import server.maps.MapleMapObject;
import server.maps.MapleMapObjectType;
import tools.PacketCreator;
import tools.Pair;
@@ -151,7 +151,7 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
if (attack.skill == ChiefBandit.MESO_EXPLOSION) {
int delay = 0;
for (Integer oned : attack.allDamage.keySet()) {
MapleMapObject mapobject = map.getMapObject(oned);
MapObject mapobject = map.getMapObject(oned);
if (mapobject != null && mapobject.getType() == MapleMapObjectType.ITEM) {
final MapItem mapitem = (MapItem) mapobject;
if (mapitem.getMeso() == 0) { //Maybe it is possible some how?

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

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

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

@@ -25,7 +25,7 @@ import client.Character;
import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.maps.MapleMapObject;
import server.maps.MapObject;
import tools.PacketCreator;
public final class CharInfoRequestHandler extends AbstractPacketHandler {
@@ -34,7 +34,7 @@ public final class CharInfoRequestHandler extends AbstractPacketHandler {
public final void handlePacket(InPacket p, Client c) {
p.skip(4);
int cid = p.readInt();
MapleMapObject target = c.getPlayer().getMap().getMapObject(cid);
MapObject target = c.getPlayer().getMap().getMapObject(cid);
if (target != null) {
if (target instanceof Character) {
Character player = (Character) target;

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

@@ -26,7 +26,7 @@ import client.Character;
import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.maps.MapleMapObject;
import server.maps.MapObject;
import server.maps.MapleSummon;
import tools.PacketCreator;
@@ -39,7 +39,7 @@ public final class DamageSummonHandler extends AbstractPacketHandler {
int monsterIdFrom = p.readInt();
Character player = c.getPlayer();
MapleMapObject mmo = player.getMap().getMapObject(oid);
MapObject mmo = player.getMap().getMapObject(oid);
if(mmo != null && mmo instanceof MapleSummon) {
MapleSummon summon = (MapleSummon) mmo;

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

@@ -26,7 +26,7 @@ import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.maps.DoorObject;
import server.maps.MapleMapObject;
import server.maps.MapObject;
import tools.PacketCreator;
/**
@@ -45,7 +45,7 @@ public final class DoorHandler extends AbstractPacketHandler {
return;
}
for (MapleMapObject obj : chr.getMap().getMapObjects()) {
for (MapObject obj : chr.getMap().getMapObjects()) {
if (obj instanceof DoorObject) {
DoorObject door = (DoorObject) obj;
if (door.getOwnerId() == ownerid) {

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

@@ -27,7 +27,7 @@ import client.inventory.ItemFactory;
import constants.game.GameConstants;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.maps.MapleMapObject;
import server.maps.MapObject;
import server.maps.MapleMapObjectType;
import server.maps.MaplePlayerShop;
import server.maps.MaplePortal;
@@ -47,7 +47,7 @@ public final class HiredMerchantRequest extends AbstractPacketHandler {
Character chr = c.getPlayer();
try {
for (MapleMapObject 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(MapleMapObjectType.HIRED_MERCHANT, MapleMapObjectType.PLAYER))) {
if (mmo instanceof Character) {
Character mc = (Character) mmo;

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

@@ -25,7 +25,7 @@ import client.Character;
import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.maps.MapleMapObject;
import server.maps.MapObject;
import tools.FilePrinter;
import java.awt.*;
@@ -44,7 +44,7 @@ public final class ItemPickupHandler extends AbstractPacketHandler {
p.readPos(); //cpos
int oid = p.readInt();
Character chr = c.getPlayer();
MapleMapObject ob = chr.getMap().getMapObject(oid);
MapObject ob = chr.getMap().getMapObject(oid);
if(ob == null) return;
Point charPos = chr.getPosition();

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

@@ -29,8 +29,8 @@ import server.life.MobSkill;
import server.life.MobSkillFactory;
import server.life.Monster;
import server.life.MonsterInformationProvider;
import server.maps.MapObject;
import server.maps.MapleMap;
import server.maps.MapleMapObject;
import server.maps.MapleMapObjectType;
import tools.PacketCreator;
import tools.Pair;
@@ -59,7 +59,7 @@ public final class MoveLifeHandler extends AbstractMovementPacketHandler {
int objectid = p.readInt();
short moveid = p.readShort();
MapleMapObject mmo = map.getMapObject(objectid);
MapObject mmo = map.getMapObject(objectid);
if (mmo == null || mmo.getType() != MapleMapObjectType.MONSTER) {
return;
}

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

@@ -29,7 +29,7 @@ import net.packet.InPacket;
import scripting.npc.NPCScriptManager;
import server.life.NPC;
import server.life.PlayerNPC;
import server.maps.MapleMapObject;
import server.maps.MapObject;
import tools.FilePrinter;
import tools.PacketCreator;
@@ -47,7 +47,7 @@ public final class NPCTalkHandler extends AbstractPacketHandler {
}
int oid = p.readInt();
MapleMapObject obj = c.getPlayer().getMap().getMapObject(oid);
MapObject obj = c.getPlayer().getMap().getMapObject(oid);
if (obj instanceof NPC) {
NPC npc = (NPC) obj;
if(YamlConfig.config.server.USE_DEBUG == true) c.getPlayer().dropMessage(5, "Talking to NPC " + npc.getId());

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

@@ -27,7 +27,7 @@ import client.inventory.Pet;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.maps.MapItem;
import server.maps.MapleMapObject;
import server.maps.MapObject;
import tools.PacketCreator;
import java.util.Set;
@@ -50,7 +50,7 @@ public final class PetLootHandler extends AbstractPacketHandler {
p.skip(13);
int oid = p.readInt();
MapleMapObject ob = chr.getMap().getMapObject(oid);
MapObject ob = chr.getMap().getMapObject(oid);
try {
MapItem mapitem = (MapItem) ob;
if (mapitem.getMeso() > 0) {

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

@@ -281,7 +281,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
if (isTradeOpen(chr)) return;
int oid = p.readInt();
MapleMapObject ob = chr.getMap().getMapObject(oid);
MapObject ob = chr.getMap().getMapObject(oid);
if (ob instanceof MaplePlayerShop) {
MaplePlayerShop shop = (MaplePlayerShop) ob;
shop.visitShop(chr);
@@ -795,7 +795,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
private static boolean canPlaceStore(Character chr) {
try {
for (MapleMapObject 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(MapleMapObjectType.HIRED_MERCHANT, MapleMapObjectType.PLAYER))) {
if (mmo instanceof Character) {
Character mc = (Character) mmo;
if (mc.getId() == chr.getId()) {

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

@@ -26,7 +26,7 @@ import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.life.Monster;
import server.maps.MapleMapObject;
import server.maps.MapObject;
import tools.PacketCreator;
import tools.Pair;
@@ -53,7 +53,7 @@ public final class PlayerMapTransitionHandler extends AbstractPacketHandler {
}
if (!chr.isHidden()) { // thanks Lame (Conrad) for noticing hidden characters controlling mobs
for (MapleMapObject mo : chr.getMap().getMonsters()) { // thanks BHB, IxianMace, Jefe for noticing several issues regarding mob statuses (such as freeze)
for (MapObject mo : chr.getMap().getMonsters()) { // thanks BHB, IxianMace, Jefe for noticing several issues regarding mob statuses (such as freeze)
Monster m = (Monster) mo;
if (m.getSpawnEffect() == 0 || m.getHp() < m.getMaxHp()) { // avoid effect-spawning mobs
if (m.getController() == chr) {

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

@@ -38,8 +38,8 @@ import net.packet.InPacket;
import server.MapleStatEffect;
import server.life.LifeFactory.loseItem;
import server.life.*;
import server.maps.MapObject;
import server.maps.MapleMap;
import server.maps.MapleMapObject;
import tools.FilePrinter;
import tools.PacketCreator;
import tools.Randomizer;
@@ -71,7 +71,7 @@ public final class TakeDamageHandler extends AbstractPacketHandler {
oid = p.readInt();
try {
MapleMapObject mmo = map.getMapObject(oid);
MapObject mmo = map.getMapObject(oid);
if(mmo instanceof Monster) {
attacker = (Monster) mmo;
if(attacker.getId() != monsteridfrom) {