merge fixes

2006Redone Server/src/redone/game/objects/Objects.java

@@ -1,5 +1,7 @@
 package redone.game.objects;
 
+import redone.world.clip.ObjectDef;
+
 public class Objects {
 
 	public long delay, oDelay;
@@ -36,6 +38,33 @@ public class Objects {
 		objectTicks = ticks;
 	}
 
+	public int[] getObjectSize() {
+		ObjectDef def = ObjectDef.getObjectDef(objectId);
+		if (def == null)
+			return new int[] {1, 1};
+		int xLength;
+		int yLength;
+		if (objectFace != 1 && objectFace != 3) {
+			xLength = def.xLength();
+			yLength = def.yLength();
+		} else {
+			xLength = def.yLength();
+			yLength = def.xLength();
+		}
+
+		return new int[] {xLength, yLength};
+	}
+
+	@Override
+	public String toString() {
+		return "Objects{" +
+				"objectId=" + objectId +
+				", objectX=" + objectX +
+				", objectY=" + objectY +
+				", objectHeight=" + objectHeight +
+				'}';
+	}
+
 	public int getObjectHeight() {
 		return objectHeight;
 	}

2006Redone Server/src/redone/game/players/Player.java

@@ -403,7 +403,7 @@ public abstract class Player {
 			totalDamageDealt, globalDamageDealt, oldNpcIndex, fightMode, attackTimer;
 	public boolean magicFailed, oldMagicFailed;
 	public int bowSpecShot, clickNpcType, clickObjectType, objectId, objectX,
-			objectY, objectXOffset, objectYOffset, objectDistance;
+			objectY;
 	public int pItemX, pItemY, pItemId;
 	public boolean isMoving, walkingToItem;
 	public boolean isShopping, updateShop;