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

Rename and clean up AbstractAnimatedMapleMapObject

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:16:30 +02:00
parent af2707120a
commit 8814a18d0c
7 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ import net.server.audit.locks.MonitoredWriteLock;
import net.server.audit.locks.factory.MonitoredReadLockFactory; import net.server.audit.locks.factory.MonitoredReadLockFactory;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory; import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import net.server.audit.locks.factory.MonitoredWriteLockFactory; import net.server.audit.locks.factory.MonitoredWriteLockFactory;
import server.maps.AbstractAnimatedMapleMapObject; import server.maps.AbstractAnimatedMapObject;
import server.maps.MapleMap; import server.maps.MapleMap;
import java.util.Arrays; import java.util.Arrays;
@@ -39,7 +39,7 @@ import java.util.concurrent.locks.Lock;
/** /**
* @author RonanLana * @author RonanLana
*/ */
public abstract class AbstractCharacterObject extends AbstractAnimatedMapleMapObject { public abstract class AbstractCharacterObject extends AbstractAnimatedMapObject {
protected MapleMap map; protected MapleMap map;
protected int str, dex, luk, int_, hp, maxhp, mp, maxmp; protected int str, dex, luk, int_, hp, maxhp, mp, maxmp;
protected int hpMpApUsed, remainingAp; protected int hpMpApUsed, remainingAp;

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

@@ -1219,7 +1219,7 @@ public class Character extends AbstractCharacterObject {
} }
public void broadcastStance() { 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) { public MapleMap getWarpMap(int map) {

4
src/main/java/server/life/AbstractLoadedLife.java
View File

@@ -21,9 +21,9 @@
*/ */
package server.life; 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 final int id;
private int f; private int f;
private boolean hide; private boolean hide;

4
src/main/java/server/life/Monster.java
View File

@@ -46,7 +46,7 @@ import server.MapleStatEffect;
import server.TimerManager; import server.TimerManager;
import server.life.LifeFactory.BanishInfo; import server.life.LifeFactory.BanishInfo;
import server.loot.LootManager; import server.loot.LootManager;
import server.maps.AbstractAnimatedMapleMapObject; import server.maps.AbstractAnimatedMapObject;
import server.maps.MapleMap; import server.maps.MapleMap;
import server.maps.MapleMapObjectType; import server.maps.MapleMapObjectType;
import server.maps.MapleSummon; import server.maps.MapleSummon;
@@ -1329,7 +1329,7 @@ public class Monster extends AbstractLoadedLife {
aggroRemoveController(); aggroRemoveController();
setPosition(newPoint); 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()); map.moveMonster(this, this.getPosition());
aggroUpdateController(); aggroUpdateController();

60
src/main/java/server/maps/AbstractAnimatedMapleMapObject.java → src/main/java/server/maps/AbstractAnimatedMapObject.java
View File

@@ -21,16 +21,16 @@
*/ */
package server.maps; package server.maps;
import java.util.Arrays;
import io.netty.buffer.Unpooled; import io.netty.buffer.Unpooled;
import net.packet.*; import net.packet.*;
public abstract class AbstractAnimatedMapleMapObject extends AbstractMapleMapObject implements AnimatedMapleMapObject { import java.util.Arrays;
public static final int IDLE_MOVEMENT_PACKET_LENGTH = 15;
private static final Packet IDLE_MOVEMENT_PACKET = createIdleMovementPacket();
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 @Override
public int getStance() { public int getStance() {
@@ -46,32 +46,32 @@ public abstract class AbstractAnimatedMapleMapObject extends AbstractMapleMapObj
public boolean isFacingLeft() { public boolean isFacingLeft() {
return Math.abs(stance) % 2 == 1; return Math.abs(stance) % 2 == 1;
} }
public InPacket getIdleMovement() { public InPacket getIdleMovement() {
final byte[] idleMovementBytes = IDLE_MOVEMENT_PACKET.getBytes(); final byte[] idleMovementBytes = IDLE_MOVEMENT_PACKET.getBytes();
byte[] movementData = Arrays.copyOf(idleMovementBytes, idleMovementBytes.length); byte[] movementData = Arrays.copyOf(idleMovementBytes, idleMovementBytes.length);
//seems wasteful to create a whole packet writer when only a few values are changed //seems wasteful to create a whole packet writer when only a few values are changed
int x = getPosition().x; int x = getPosition().x;
int y = getPosition().y; int y = getPosition().y;
movementData[2] = (byte) (x & 0xFF); //x movementData[2] = (byte) (x & 0xFF); //x
movementData[3] = (byte) (x >> 8 & 0xFF); movementData[3] = (byte) (x >> 8 & 0xFF);
movementData[4] = (byte) (y & 0xFF); //y movementData[4] = (byte) (y & 0xFF); //y
movementData[5] = (byte) (y >> 8 & 0xFF); movementData[5] = (byte) (y >> 8 & 0xFF);
movementData[12] = (byte) (getStance() & 0xFF); movementData[12] = (byte) (getStance() & 0xFF);
return new ByteBufInPacket(Unpooled.wrappedBuffer(movementData)); return new ByteBufInPacket(Unpooled.wrappedBuffer(movementData));
} }
private static Packet createIdleMovementPacket() { private static Packet createIdleMovementPacket() {
OutPacket p = new ByteBufOutPacket(); OutPacket p = new ByteBufOutPacket();
p.writeByte(1); //movement command count p.writeByte(1); //movement command count
p.writeByte(0); p.writeByte(0);
p.writeShort(-1); //x p.writeShort(-1); //x
p.writeShort(-1); //y p.writeShort(-1); //y
p.writeShort(0); //xwobble p.writeShort(0); //xwobble
p.writeShort(0); //ywobble p.writeShort(0); //ywobble
p.writeShort(0); //fh p.writeShort(0); //fh
p.writeByte(-1); //stance p.writeByte(-1); //stance
p.writeShort(0); //duration p.writeShort(0); //duration
return p; return p;
} }
} }

2
src/main/java/server/maps/MapleDragon.java
View File

@@ -27,7 +27,7 @@ import tools.PacketCreator;
public class MapleDragon extends AbstractAnimatedMapleMapObject { public class MapleDragon extends AbstractAnimatedMapObject {
private Character owner; private Character owner;

2
src/main/java/server/maps/MapleSummon.java
View File

@@ -32,7 +32,7 @@ import java.awt.*;
* *
* @author Jan * @author Jan
*/ */
public class MapleSummon extends AbstractAnimatedMapleMapObject { public class MapleSummon extends AbstractAnimatedMapObject {
private Character owner; private Character owner;
private byte skillLevel; private byte skillLevel;
private int skill, hp; private int skill, hp;