From ca4162cb8261a0d962ce8a9706a96d2c4c5da321 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 22:17:38 +0200 Subject: [PATCH] Rename and clean up AnimatedMapleMapObject --- .../channel/handlers/AbstractMovementPacketHandler.java | 4 ++-- src/main/java/server/maps/AbstractAnimatedMapObject.java | 2 +- .../{AnimatedMapleMapObject.java => AnimatedMapObject.java} | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename src/main/java/server/maps/{AnimatedMapleMapObject.java => AnimatedMapObject.java} (94%) diff --git a/src/main/java/net/server/channel/handlers/AbstractMovementPacketHandler.java b/src/main/java/net/server/channel/handlers/AbstractMovementPacketHandler.java index 1fc583fcdd..d68d9b0cb9 100644 --- a/src/main/java/net/server/channel/handlers/AbstractMovementPacketHandler.java +++ b/src/main/java/net/server/channel/handlers/AbstractMovementPacketHandler.java @@ -23,7 +23,7 @@ package net.server.channel.handlers; import net.AbstractPacketHandler; import net.packet.InPacket; -import server.maps.AnimatedMapleMapObject; +import server.maps.AnimatedMapObject; import server.movement.*; import tools.exceptions.EmptyMovementException; @@ -145,7 +145,7 @@ public abstract class AbstractMovementPacketHandler extends AbstractPacketHandle return res; } - protected void updatePosition(InPacket p, AnimatedMapleMapObject target, int yOffset) throws EmptyMovementException { + protected void updatePosition(InPacket p, AnimatedMapObject target, int yOffset) throws EmptyMovementException { byte numCommands = p.readByte(); if (numCommands < 1) throw new EmptyMovementException(p); diff --git a/src/main/java/server/maps/AbstractAnimatedMapObject.java b/src/main/java/server/maps/AbstractAnimatedMapObject.java index 82c23ff827..f0dba2ca91 100644 --- a/src/main/java/server/maps/AbstractAnimatedMapObject.java +++ b/src/main/java/server/maps/AbstractAnimatedMapObject.java @@ -26,7 +26,7 @@ import net.packet.*; import java.util.Arrays; -public abstract class AbstractAnimatedMapObject extends AbstractMapObject implements AnimatedMapleMapObject { +public abstract class AbstractAnimatedMapObject extends AbstractMapObject implements AnimatedMapObject { public static final int IDLE_MOVEMENT_PACKET_LENGTH = 15; private static final Packet IDLE_MOVEMENT_PACKET = createIdleMovementPacket(); diff --git a/src/main/java/server/maps/AnimatedMapleMapObject.java b/src/main/java/server/maps/AnimatedMapObject.java similarity index 94% rename from src/main/java/server/maps/AnimatedMapleMapObject.java rename to src/main/java/server/maps/AnimatedMapObject.java index 6c6fad905b..b9d8ec6306 100644 --- a/src/main/java/server/maps/AnimatedMapleMapObject.java +++ b/src/main/java/server/maps/AnimatedMapObject.java @@ -21,7 +21,7 @@ */ package server.maps; -public interface AnimatedMapleMapObject extends MapleMapObject { +public interface AnimatedMapObject extends MapleMapObject { int getStance(); void setStance(int stance); boolean isFacingLeft();