diff --git a/src/main/java/client/AbstractCharacterObject.java b/src/main/java/client/AbstractCharacterObject.java index 891cc42794..d7dc91400d 100644 --- a/src/main/java/client/AbstractCharacterObject.java +++ b/src/main/java/client/AbstractCharacterObject.java @@ -28,7 +28,7 @@ import net.server.audit.locks.MonitoredWriteLock; import net.server.audit.locks.factory.MonitoredReadLockFactory; import net.server.audit.locks.factory.MonitoredReentrantLockFactory; import net.server.audit.locks.factory.MonitoredWriteLockFactory; -import server.maps.AbstractAnimatedMapleMapObject; +import server.maps.AbstractAnimatedMapObject; import server.maps.MapleMap; import java.util.Arrays; @@ -39,7 +39,7 @@ import java.util.concurrent.locks.Lock; /** * @author RonanLana */ -public abstract class AbstractCharacterObject extends AbstractAnimatedMapleMapObject { +public abstract class AbstractCharacterObject extends AbstractAnimatedMapObject { protected MapleMap map; protected int str, dex, luk, int_, hp, maxhp, mp, maxmp; protected int hpMpApUsed, remainingAp; diff --git a/src/main/java/client/Character.java b/src/main/java/client/Character.java index 81f06c6566..b268c8c1f7 100644 --- a/src/main/java/client/Character.java +++ b/src/main/java/client/Character.java @@ -1219,7 +1219,7 @@ public class Character extends AbstractCharacterObject { } public void broadcastStance() { - map.broadcastMessage(this, PacketCreator.movePlayer(id, this.getIdleMovement(), AbstractAnimatedMapleMapObject.IDLE_MOVEMENT_PACKET_LENGTH), false); + map.broadcastMessage(this, PacketCreator.movePlayer(id, this.getIdleMovement(), AbstractAnimatedMapObject.IDLE_MOVEMENT_PACKET_LENGTH), false); } public MapleMap getWarpMap(int map) { diff --git a/src/main/java/server/life/AbstractLoadedLife.java b/src/main/java/server/life/AbstractLoadedLife.java index 670f532d2a..c43a2ee57b 100644 --- a/src/main/java/server/life/AbstractLoadedLife.java +++ b/src/main/java/server/life/AbstractLoadedLife.java @@ -21,9 +21,9 @@ */ package server.life; -import server.maps.AbstractAnimatedMapleMapObject; +import server.maps.AbstractAnimatedMapObject; -public abstract class AbstractLoadedLife extends AbstractAnimatedMapleMapObject { +public abstract class AbstractLoadedLife extends AbstractAnimatedMapObject { private final int id; private int f; private boolean hide; diff --git a/src/main/java/server/life/Monster.java b/src/main/java/server/life/Monster.java index 1c39354b13..16866ac7ef 100644 --- a/src/main/java/server/life/Monster.java +++ b/src/main/java/server/life/Monster.java @@ -46,7 +46,7 @@ import server.MapleStatEffect; import server.TimerManager; import server.life.LifeFactory.BanishInfo; import server.loot.LootManager; -import server.maps.AbstractAnimatedMapleMapObject; +import server.maps.AbstractAnimatedMapObject; import server.maps.MapleMap; import server.maps.MapleMapObjectType; import server.maps.MapleSummon; @@ -1329,7 +1329,7 @@ public class Monster extends AbstractLoadedLife { aggroRemoveController(); setPosition(newPoint); - map.broadcastMessage(PacketCreator.moveMonster(this.getObjectId(), false, -1, 0, 0, 0, this.getPosition(), this.getIdleMovement(), AbstractAnimatedMapleMapObject.IDLE_MOVEMENT_PACKET_LENGTH)); + map.broadcastMessage(PacketCreator.moveMonster(this.getObjectId(), false, -1, 0, 0, 0, this.getPosition(), this.getIdleMovement(), AbstractAnimatedMapObject.IDLE_MOVEMENT_PACKET_LENGTH)); map.moveMonster(this, this.getPosition()); aggroUpdateController(); diff --git a/src/main/java/server/maps/AbstractAnimatedMapleMapObject.java b/src/main/java/server/maps/AbstractAnimatedMapObject.java similarity index 52% rename from src/main/java/server/maps/AbstractAnimatedMapleMapObject.java rename to src/main/java/server/maps/AbstractAnimatedMapObject.java index 3fc3098012..79126a9277 100644 --- a/src/main/java/server/maps/AbstractAnimatedMapleMapObject.java +++ b/src/main/java/server/maps/AbstractAnimatedMapObject.java @@ -21,16 +21,16 @@ */ package server.maps; -import java.util.Arrays; - import io.netty.buffer.Unpooled; import net.packet.*; -public abstract class AbstractAnimatedMapleMapObject extends AbstractMapleMapObject implements AnimatedMapleMapObject { - public static final int IDLE_MOVEMENT_PACKET_LENGTH = 15; - private static final Packet IDLE_MOVEMENT_PACKET = createIdleMovementPacket(); +import java.util.Arrays; - private int stance; +public abstract class AbstractAnimatedMapObject extends AbstractMapleMapObject implements AnimatedMapleMapObject { + public static final int IDLE_MOVEMENT_PACKET_LENGTH = 15; + private static final Packet IDLE_MOVEMENT_PACKET = createIdleMovementPacket(); + + private int stance; @Override public int getStance() { @@ -46,32 +46,32 @@ public abstract class AbstractAnimatedMapleMapObject extends AbstractMapleMapObj public boolean isFacingLeft() { return Math.abs(stance) % 2 == 1; } - + public InPacket getIdleMovement() { - final byte[] idleMovementBytes = IDLE_MOVEMENT_PACKET.getBytes(); - byte[] movementData = Arrays.copyOf(idleMovementBytes, idleMovementBytes.length); - //seems wasteful to create a whole packet writer when only a few values are changed - int x = getPosition().x; - int y = getPosition().y; - movementData[2] = (byte) (x & 0xFF); //x - movementData[3] = (byte) (x >> 8 & 0xFF); - movementData[4] = (byte) (y & 0xFF); //y - movementData[5] = (byte) (y >> 8 & 0xFF); - movementData[12] = (byte) (getStance() & 0xFF); - return new ByteBufInPacket(Unpooled.wrappedBuffer(movementData)); + final byte[] idleMovementBytes = IDLE_MOVEMENT_PACKET.getBytes(); + byte[] movementData = Arrays.copyOf(idleMovementBytes, idleMovementBytes.length); + //seems wasteful to create a whole packet writer when only a few values are changed + int x = getPosition().x; + int y = getPosition().y; + movementData[2] = (byte) (x & 0xFF); //x + movementData[3] = (byte) (x >> 8 & 0xFF); + movementData[4] = (byte) (y & 0xFF); //y + movementData[5] = (byte) (y >> 8 & 0xFF); + movementData[12] = (byte) (getStance() & 0xFF); + return new ByteBufInPacket(Unpooled.wrappedBuffer(movementData)); } private static Packet createIdleMovementPacket() { - OutPacket p = new ByteBufOutPacket(); - p.writeByte(1); //movement command count - p.writeByte(0); - p.writeShort(-1); //x - p.writeShort(-1); //y - p.writeShort(0); //xwobble - p.writeShort(0); //ywobble - p.writeShort(0); //fh - p.writeByte(-1); //stance - p.writeShort(0); //duration - return p; - } + OutPacket p = new ByteBufOutPacket(); + p.writeByte(1); //movement command count + p.writeByte(0); + p.writeShort(-1); //x + p.writeShort(-1); //y + p.writeShort(0); //xwobble + p.writeShort(0); //ywobble + p.writeShort(0); //fh + p.writeByte(-1); //stance + p.writeShort(0); //duration + return p; + } } diff --git a/src/main/java/server/maps/MapleDragon.java b/src/main/java/server/maps/MapleDragon.java index 96b1aba0eb..0fee16cf69 100644 --- a/src/main/java/server/maps/MapleDragon.java +++ b/src/main/java/server/maps/MapleDragon.java @@ -27,7 +27,7 @@ import tools.PacketCreator; -public class MapleDragon extends AbstractAnimatedMapleMapObject { +public class MapleDragon extends AbstractAnimatedMapObject { private Character owner; diff --git a/src/main/java/server/maps/MapleSummon.java b/src/main/java/server/maps/MapleSummon.java index 7f6ce8a08c..7c0fe833b2 100644 --- a/src/main/java/server/maps/MapleSummon.java +++ b/src/main/java/server/maps/MapleSummon.java @@ -32,7 +32,7 @@ import java.awt.*; * * @author Jan */ -public class MapleSummon extends AbstractAnimatedMapleMapObject { +public class MapleSummon extends AbstractAnimatedMapObject { private Character owner; private byte skillLevel; private int skill, hp;