diff --git a/.idea/2006rebotted.iml b/.idea/2006rebotted.iml index c750aecb..09faeb4e 100644 --- a/.idea/2006rebotted.iml +++ b/.idea/2006rebotted.iml @@ -81,15 +81,6 @@ - - - - - - - - - diff --git a/2006Redone Server/data/logs/dropitem/michael.txt b/2006Redone Server/data/logs/dropitem/michael.txt new file mode 100644 index 00000000..71de7e02 --- /dev/null +++ b/2006Redone Server/data/logs/dropitem/michael.txt @@ -0,0 +1,2 @@ +[2019/10/26] 13:49 michael dropped 1 chef's hat absX: 3250 absY: 3225 +[2019/10/26] 13:49 michael dropped 1 fire talisman absX: 3250 absY: 3225 diff --git a/2006Redone Server/data/logs/pickupitem/michael.txt b/2006Redone Server/data/logs/pickupitem/michael.txt new file mode 100644 index 00000000..4952ddb9 --- /dev/null +++ b/2006Redone Server/data/logs/pickupitem/michael.txt @@ -0,0 +1,2 @@ +[2019/10/26] 13:50 michael picked up fire talisman itemX: 3250, itemY: 3226 +[2019/10/26] 13:50 michael picked up chef's hat itemX: 3250, itemY: 3226 diff --git a/2006Redone Server/src/redone/event/CycleEventHandler.java b/2006Redone Server/src/redone/event/CycleEventHandler.java index 6b6939ed..22a0eb1b 100644 --- a/2006Redone Server/src/redone/event/CycleEventHandler.java +++ b/2006Redone Server/src/redone/event/CycleEventHandler.java @@ -48,8 +48,10 @@ public class CycleEventHandler { * @param event * @param cycles */ - public void addEvent(int id, Object owner, CycleEvent event, int cycles) { - events.add(new CycleEventContainer(id, owner, event, cycles)); + public CycleEventContainer addEvent(int id, Object owner, CycleEvent event, int cycles) { + CycleEventContainer container = new CycleEventContainer(id, owner, event, cycles); + events.add(container); + return container; } /** @@ -59,8 +61,10 @@ public class CycleEventHandler { * @param event * @param cycles */ - public void addEvent(Object owner, CycleEvent event, int cycles) { - events.add(new CycleEventContainer(-1, owner, event, cycles)); + public CycleEventContainer addEvent(Object owner, CycleEvent event, int cycles) { + CycleEventContainer container = new CycleEventContainer(-1, owner, event, cycles); + events.add(container); + return container; } /** diff --git a/2006Redone Server/src/redone/game/objects/Objects.java b/2006Redone Server/src/redone/game/objects/Objects.java index 65822c68..588cd8ac 100644 --- a/2006Redone Server/src/redone/game/objects/Objects.java +++ b/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; } diff --git a/2006Redone Server/src/redone/game/players/Client.java b/2006Redone Server/src/redone/game/players/Client.java index 6feb622e..b7b4131f 100644 --- a/2006Redone Server/src/redone/game/players/Client.java +++ b/2006Redone Server/src/redone/game/players/Client.java @@ -139,8 +139,7 @@ public class Client extends Player { private Mining mining = new Mining(); private ChallengePlayer challengePlayer = new ChallengePlayer(); private DwarfCannon dwarfCannon = new DwarfCannon(this); - - + private CycleEventContainer currentTask; public DwarfCannon getCannon() { return dwarfCannon; @@ -322,14 +321,6 @@ public class Client extends Player { return witchsPotion; } - public void setCurrentTask(Future task) { - currentTask = task; - } - - public Future getCurrentTask() { - return currentTask; - } - public synchronized Stream getInStream() { return inStream; } @@ -397,7 +388,19 @@ public class Client extends Player { public Food getFood() { return food; } - + + public void startCurrentTask(int ticksBetweenExecution, CycleEvent event) { + endCurrentTask(); + currentTask = CycleEventHandler.getSingleton().addEvent(this, event, ticksBetweenExecution); + } + + public void endCurrentTask() { + if (currentTask != null && currentTask.isRunning()) { + currentTask.stop(); + currentTask = null; + } + } + private Map interfaceText = new HashMap(); public class TinterfaceText { @@ -427,7 +430,6 @@ public class Client extends Player { public int lowMemoryVersion = 0; public int timeOutCounter = 0; public int returnCode = 2; - private Future currentTask; public Client(IoSession s, int _playerId) { super(_playerId); diff --git a/2006Redone Server/src/redone/game/players/Player.java b/2006Redone Server/src/redone/game/players/Player.java index eac6765b..f88b51b1 100644 --- a/2006Redone Server/src/redone/game/players/Player.java +++ b/2006Redone Server/src/redone/game/players/Player.java @@ -401,7 +401,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; diff --git a/2006Redone Server/src/redone/integrations/PlayersOnlineWebsite.java b/2006Redone Server/src/redone/integrations/PlayersOnlineWebsite.java index df0f13a8..8f70b61a 100644 --- a/2006Redone Server/src/redone/integrations/PlayersOnlineWebsite.java +++ b/2006Redone Server/src/redone/integrations/PlayersOnlineWebsite.java @@ -18,7 +18,7 @@ public class PlayersOnlineWebsite { private static int count = 50; public static void addUpdatePlayersOnlineTask() { - if (!password.equals("")) { + if (password != null && !password.equals("")) { if (count == 0) { try { setWebsitePlayersOnline(PlayerHandler.getPlayerCount()); diff --git a/2006Redone Server/src/redone/net/packets/impl/AttackPlayer.java b/2006Redone Server/src/redone/net/packets/impl/AttackPlayer.java index 47450bd8..dd9d721a 100644 --- a/2006Redone Server/src/redone/net/packets/impl/AttackPlayer.java +++ b/2006Redone Server/src/redone/net/packets/impl/AttackPlayer.java @@ -18,6 +18,7 @@ public class AttackPlayer implements PacketType { @Override public void processPacket(Client c, int packetType, int packetSize) { + c.endCurrentTask(); c.playerIndex = 0; c.npcIndex = 0; switch (packetType) { diff --git a/2006Redone Server/src/redone/net/packets/impl/Bank10.java b/2006Redone Server/src/redone/net/packets/impl/Bank10.java index 73a0e806..d2a8dd72 100644 --- a/2006Redone Server/src/redone/net/packets/impl/Bank10.java +++ b/2006Redone Server/src/redone/net/packets/impl/Bank10.java @@ -15,7 +15,7 @@ public class Bank10 implements PacketType { int interfaceId = player.getInStream().readUnsignedWordBigEndian(); int removeId = player.getInStream().readUnsignedWordA(); int removeSlot = player.getInStream().readUnsignedWordA(); - + player.endCurrentTask(); switch (interfaceId) { case 4233: diff --git a/2006Redone Server/src/redone/net/packets/impl/Bank5.java b/2006Redone Server/src/redone/net/packets/impl/Bank5.java index 86861ebe..f1256e26 100644 --- a/2006Redone Server/src/redone/net/packets/impl/Bank5.java +++ b/2006Redone Server/src/redone/net/packets/impl/Bank5.java @@ -15,7 +15,7 @@ public class Bank5 implements PacketType { int interfaceId = player.getInStream().readSignedWordBigEndianA(); int removeId = player.getInStream().readSignedWordBigEndianA(); int removeSlot = player.getInStream().readSignedWordBigEndian(); - + player.endCurrentTask(); switch (interfaceId) { case 4233: diff --git a/2006Redone Server/src/redone/net/packets/impl/BankAll.java b/2006Redone Server/src/redone/net/packets/impl/BankAll.java index 0ff5824a..f908fe3a 100644 --- a/2006Redone Server/src/redone/net/packets/impl/BankAll.java +++ b/2006Redone Server/src/redone/net/packets/impl/BankAll.java @@ -17,6 +17,7 @@ public class BankAll implements PacketType { int removeSlot = player.getInStream().readUnsignedWordA(); int interfaceId = player.getInStream().readUnsignedWord(); int removeId = player.getInStream().readUnsignedWordA(); + player.endCurrentTask(); switch (interfaceId) { case 3900: player.getShopAssistant().buyItem(removeId, removeSlot, 10); diff --git a/2006Redone Server/src/redone/net/packets/impl/BankX1.java b/2006Redone Server/src/redone/net/packets/impl/BankX1.java index f76a1bb3..40f430e8 100644 --- a/2006Redone Server/src/redone/net/packets/impl/BankX1.java +++ b/2006Redone Server/src/redone/net/packets/impl/BankX1.java @@ -14,6 +14,7 @@ public class BankX1 implements PacketType { @Override public void processPacket(Client c, int packetType, int packetSize) { + c.endCurrentTask(); if (packetType == 135) { c.xRemoveSlot = c.getInStream().readSignedWordBigEndian(); c.xInterfaceId = c.getInStream().readUnsignedWordA(); diff --git a/2006Redone Server/src/redone/net/packets/impl/BankX2.java b/2006Redone Server/src/redone/net/packets/impl/BankX2.java index 9c9f0154..129615ca 100644 --- a/2006Redone Server/src/redone/net/packets/impl/BankX2.java +++ b/2006Redone Server/src/redone/net/packets/impl/BankX2.java @@ -11,6 +11,7 @@ public class BankX2 implements PacketType { @Override public void processPacket(Client player, int packetType, int packetSize) { + player.endCurrentTask(); int Xamount = player.getInStream().readDWord(); if (Xamount < 0) { Xamount = player.getItemAssistant().getItemAmount(player.xRemoveId); diff --git a/2006Redone Server/src/redone/net/packets/impl/ChangeAppearance.java b/2006Redone Server/src/redone/net/packets/impl/ChangeAppearance.java index e6031fea..1bab54c2 100644 --- a/2006Redone Server/src/redone/net/packets/impl/ChangeAppearance.java +++ b/2006Redone Server/src/redone/net/packets/impl/ChangeAppearance.java @@ -81,6 +81,7 @@ public class ChangeAppearance implements PacketType { client.playerAppearance[11] = colors[3]; // feet colour client.playerAppearance[12] = colors[4]; // skin colour + client.endCurrentTask(); client.getPlayerAssistant().removeAllWindows(); client.getPlayerAssistant().requestUpdates(); client.canChangeAppearance = false; diff --git a/2006Redone Server/src/redone/net/packets/impl/ClickItem.java b/2006Redone Server/src/redone/net/packets/impl/ClickItem.java index 88cb98d4..f2a14723 100644 --- a/2006Redone Server/src/redone/net/packets/impl/ClickItem.java +++ b/2006Redone Server/src/redone/net/packets/impl/ClickItem.java @@ -23,6 +23,7 @@ public class ClickItem implements PacketType { @Override public void processPacket(Client player, int packetType, int packetSize) { + player.endCurrentTask(); player.getInStream().readSignedWordBigEndianA(); int itemSlot = player.getInStream().readUnsignedWordA(); int itemId = player.getInStream().readUnsignedWordBigEndian(); diff --git a/2006Redone Server/src/redone/net/packets/impl/ClickNPC.java b/2006Redone Server/src/redone/net/packets/impl/ClickNPC.java index 61c1be5f..92a33790 100644 --- a/2006Redone Server/src/redone/net/packets/impl/ClickNPC.java +++ b/2006Redone Server/src/redone/net/packets/impl/ClickNPC.java @@ -29,6 +29,7 @@ public class ClickNPC implements PacketType { client.getPlayerAssistant().resetFollow(); client.getCombatAssistant().resetPlayerAttack(); client.getPlayerAssistant().requestUpdates(); + client.endCurrentTask(); switch (packetType) { /** diff --git a/2006Redone Server/src/redone/net/packets/impl/ClickObject.java b/2006Redone Server/src/redone/net/packets/impl/ClickObject.java index e2524241..37e8129f 100644 --- a/2006Redone Server/src/redone/net/packets/impl/ClickObject.java +++ b/2006Redone Server/src/redone/net/packets/impl/ClickObject.java @@ -11,30 +11,109 @@ import redone.game.content.skills.core.Woodcutting; import redone.game.content.skills.thieving.Stalls; import redone.game.globalworldobjects.Doors; import redone.game.npcs.NpcHandler; +import redone.game.objects.Objects; import redone.game.players.Client; import redone.net.packets.PacketType; +import redone.util.Misc; +import redone.world.clip.ObjectDef; +import redone.world.clip.Region; + +import java.util.function.Consumer; public class ClickObject implements PacketType { public static final int FIRST_CLICK = 132, SECOND_CLICK = 252, THIRD_CLICK = 70, FOURTH_CLICK = 234; + public void onObjectReached(Client player, Consumer consumer) { + final int objectX = player.objectX; + final int objectY = player.objectY; + final int objectId = player.objectId; + + Objects object = Region.getObject(objectId, objectX, objectY, player.heightLevel); + if (object == null) { + // Since most content is coded poorly we will have to assume the object is valid + // but we won't know the face direction, so some objects will behave incorrectly + // if the object size is not equal on both axes and the face + // is not set to zero. The proper fix would be when an object is removed or added + // they are added into the region configuration properly so we can retrieve + // the object at runtime. This will suffice for now. + object = new Objects(objectId, objectX, objectY, player.heightLevel, 0, 10, 0); + } + + int[] size = object.getObjectSize(); + + player.startCurrentTask(1, new CycleEvent() { + @Override + public void execute(CycleEventContainer container) { + if (objectX != player.objectX || objectY != player.objectY || objectId != player.objectId) { + container.stop(); + return; + } + + int x = player.absX; + int y = player.absY; + int xMin = objectX - 1; + int xMax = xMin + size[0] + 1; + int yMin = objectY - 1; + int yMax = yMin + size[1] + 1; + + if (x >= xMin && y >= yMin && x <= xMax && y <= yMax) { + consumer.accept(player); + container.stop(); + } + } + + @Override + public void stop() {} + }); + } + @Override - public void processPacket(final Client player, int packetType, - int packetSize) { + public void processPacket(final Client player, int packetType, int packetSize) { player.clickObjectType = player.objectX = player.objectId = player.objectY = 0; - player.objectYOffset = player.objectXOffset = 0; player.getPlayerAssistant().resetFollow(); player.getCombatAssistant().resetPlayerAttack(); player.getPlayerAssistant().requestUpdates(); + player.endCurrentTask(); switch (packetType) { - case FIRST_CLICK: - player.objectX = player.getInStream().readSignedWordBigEndianA(); - player.objectId = player.getInStream().readUnsignedWord(); - player.objectY = player.getInStream().readUnsignedWordA(); - player.objectDistance = 1; - player.turnPlayerTo(player.objectX, player.objectY); + case FIRST_CLICK: + player.objectX = player.getInStream().readSignedWordBigEndianA(); + player.objectId = player.getInStream().readUnsignedWord(); + player.objectY = player.getInStream().readUnsignedWordA(); + onObjectReached(player, (p) -> completeObjectClick(p, 1)); + break; + + case SECOND_CLICK: + player.objectId = player.getInStream().readUnsignedWordBigEndianA(); + player.objectY = player.getInStream().readSignedWordBigEndian(); + player.objectX = player.getInStream().readUnsignedWordA(); + onObjectReached(player, (p) -> completeObjectClick(p, 2)); + break; + + case THIRD_CLICK: // 'F' + player.objectX = player.getInStream().readSignedWordBigEndian(); + player.objectY = player.getInStream().readUnsignedWord(); + player.objectId = player.getInStream().readUnsignedWordBigEndianA(); + onObjectReached(player, (p) -> completeObjectClick(p, 3)); + break; + + + case FOURTH_CLICK: + player.objectX = player.getInStream().readSignedWordBigEndianA(); + player.objectId = player.getInStream().readUnsignedWordA(); + player.objectY = player.getInStream().readUnsignedWordBigEndianA(); + onObjectReached(player, (p) -> completeObjectClick(p, 4)); + break; + } + } + + public void completeObjectClick(final Client player, int objectOption) { + player.turnPlayerTo(player.objectX, player.objectY); + + switch (objectOption) { + case 1: if (player.playerRights == 3 || player.debugMode) { player.getActionSender().sendMessage("ObjectId: " + player.objectId + " ObjectX: " + player.objectX + " ObjectY: " + player.objectY + " Objectclick = 1, Xoff: " + (player.getX() - player.objectX) + " Yoff: " + (player.getY() - player.objectY)); } @@ -43,7 +122,7 @@ public class ClickObject implements PacketType { //System.out.println("Door debug?"); } //} - + /*if (client.performingAction) { return; }*/ @@ -62,12 +141,6 @@ public class ClickObject implements PacketType { player.resetWalkingQueue(); break; } - if (Mining.rockExists(player.objectId)) { - player.objectDistance = 5; - } - if (Woodcutting.playerTrees(player, player.objectId)) { - player.objectDistance = 3; - } switch (player.objectId) { case 1276: Woodcutting.startWoodcutting(player, 0, player.objectX, player.objectY, player.clickObjectType); @@ -132,7 +205,7 @@ public class ClickObject implements PacketType { case 1332: Woodcutting.startWoodcutting(player, 20, player.objectX, player.objectY, player.clickObjectType); break; - + case 1292: if (player.spiritTree == false && player.clickedTree == true) { player.getActionSender().sendMessage("You have already spawned a tree spirit."); @@ -152,7 +225,7 @@ public class ClickObject implements PacketType { case 1317: player.getPlayerAssistant().spiritTree(); break; - + case 2164: case 2165: Server.trawler.fixNet(player); @@ -171,18 +244,11 @@ public class ClickObject implements PacketType { } CastleWarObjects.handleObject(player, player.objectId, player.objectX, player.objectY); break; - + case 2513: player.getRangersGuild().fireAtTarget(); break; - - case 12163: - case 12164: - case 12165: - case 12166: - player.objectDistance = 4; - break; - + case 8930: player.fade(1975, 4409, 3); break; @@ -190,223 +256,6 @@ public class ClickObject implements PacketType { player.fade(2442, 10147, 0); break; - case 12982: - if (player.absY == 3278) { - player.objectYOffset = 2; - } - break; - - case 300: - if (player.objectX == 3093 && player.objectY == 3509) { - player.objectDistance = 2; - } - break; - case 2479: - case 2482: - case 10596: - case 10595: - case 1725: - case 2483: - case 4568: - case 2145: - player.objectDistance = 3; - break; - - case 11993: - case 245: - case 246: - case 273: - case 272: - case 8959: - player.objectDistance = 1; - break; - - case 492: - case 5100: - case 12127: - case 5083: - case 4551: - case 4558: - case 2634: - case 1742: - case 2484: - case 8966: - case 993: - case 2230: - case 2265: - case 4569: - case 5098: - case 5096: - case 5094: - case 3828: - player.objectDistance = 2; - break; - - - case 2617: - if (player.objectX == 3077 && player.objectY == 9768) { - player.objectDistance = 3; - } - break; - - case 2781: - if (player.objectX == 3272 && player.objectY == 3185) { - player.objectDistance = 3; - } - break; - - case 2216: - if (player.absX == 2880) { - player.objectXOffset = 3; - player.objectYOffset = 1; - } - break; - - case 3760: - if (player.objectX == 2892 && player.objectY == 10072) { - player.objectYOffset = 2; - } - break; - - case 96: - if (player.objectX == 2638 && player.objectY == 9763 - || player.objectY == 9740) { - player.objectXOffset = 3; - player.objectYOffset = 1; - } - break; - - case 2323: - if (player.objectX == 2703 && player.objectY == 3205) { - player.objectXOffset = 2; - } - break; - - case 2322: - if (player.objectX == 2705 && player.objectY == 3209) { - player.objectXOffset = 4; - } - break; - - case 190: - player.objectDistance = 3; - break; - - case 154: - player.objectDistance = 2; - break; - - case 10885: - player.objectYOffset = -3; - player.objectXOffset = 1; - break; - - case 10859: - if (player.objectX == 3356 && player.objectY == 2847) { - player.objectXOffset = 1; - player.objectYOffset = -1; - } else if (player.objectX == 3364 && player.objectY == 2833) { - player.objectXOffset = 2; - player.objectYOffset = 1; - } else { - player.objectYOffset = 2; - } - break; - - case 10860: - if (player.objectX == 3372 && player.objectY == 2839) { - player.objectYOffset = 2; - } - break; - - case 10886: - player.objectXOffset = 2; - player.objectYOffset = 1; - break; - - case 10862: - if (player.objectX == 3362 && player.objectY == 2849) { - player.objectXOffset = -3; - } - break; - - case 6552: - if (player.absX == 3234) { - player.objectXOffset = 2; - player.objectYOffset = 1; - } - break; - - case 2711: - if (player.objectX == 2631 && player.objectY == 3322) { - player.objectXOffset = 1; - player.objectYOffset = 3; - } - break; - - case 3044: - if (player.objectX == 3078 && player.objectY == 9495) { - player.objectDistance = 3; - } - break; - - case 1737: - if (player.objectX == 2662 && player.objectY == 3291) { - player.objectYOffset = 3; - } - break; - - case 11737: - player.objectYOffset = 1; - break; - - case 11724: - if (player.absX == 2971) { - player.objectXOffset = 3; - } - break; - - case 11729: - if (player.absY == 3340) { - player.objectYOffset = 2; - } - break; - - case 11732: - if (player.objectX == 3034 && player.objectY == 3363) { - player.objectXOffset = 2; - } else if (player.objectX == 3048 && player.objectY == 3352) { - player.objectYOffset = 2; - } - break; - - case 11735: - if (player.absY == 3340 || player.absY == 3384) { - player.objectYOffset = 2; - } - break; - - case 11725: - if (player.absY == 3348) { - player.objectYOffset = 1; - } - break; - - case 5097: - if (player.objectX == 2635 && player.objectY == 9514) { - player.objectXOffset = 2; - player.objectYOffset = 3; - } - break; - - case 1726: - if (player.absX == 3285 && player.absY == 3492) { - player.objectDistance = 1; - } else { - player.objectXOffset = 2; - } - break; - case 1568: if (player.objectX == 2399 && player.objectY == 3099) { player.getActionSender() @@ -531,8 +380,6 @@ public class ClickObject implements PacketType { if (player.objectX == 3058 && player.objectY == 3376) { player.getPlayerAssistant().movePlayer(3058, 9776, 0); } else if (player.objectX == 2603 && player.objectY == 3078) { - player.objectXOffset = 3; - player.objectYOffset = 1; } break; @@ -560,7 +407,7 @@ public class ClickObject implements PacketType { @Override public void stop() { - + } }, 1); } @@ -580,16 +427,12 @@ public class ClickObject implements PacketType { @Override public void stop() { - + } }, 1); } break; - case 4407: - player.objectXOffset = 2; - break; - case 4387: CastleWars.addToWaitRoom(player, 1); // saradomin break; @@ -606,390 +449,11 @@ public class ClickObject implements PacketType { case 4390: // zammy waiting room portal CastleWars.leaveWaitingRoom(player); break; - - /* - * werewolf agility course stepping stone - */ - case 5138: - case 5136: - case 5141: - case 5133: - case 5152: - player.objectDistance = 2; - break; - /* - * agility pyramid gap - */ - case 10863: - case 10857: - player.objectDistance = 4; - break; - /* - * rope swing in barbarian agility arena - */ - case 2282: - player.objectDistance = 4; - break; - - case 2294: - player.objectDistance = 4; - break; - - case 9295: - if (player.absX == 3155) { - player.objectDistance = 2; - } - break; - - case 2491: - if (player.objectX == 2926 && player.objectY == 4817) { - player.objectXOffset = 1; - player.objectYOffset = -3; - } - if (player.objectX == 2927 && player.objectY == 4814) { - player.objectXOffset = -1; - player.objectYOffset = 3; - } - if (player.objectX == 2893 && player.objectY == 4812) { - player.objectXOffset = 2; - player.objectYOffset = 5; - } - if (player.objectX == 2925 && player.objectY == 4848) { - player.objectXOffset = 2; - player.objectYOffset = 5; - } - if (player.objectX == 2891 && player.objectY == 4847) { - player.objectXOffset = 2; - player.objectYOffset = -1; - } - break; - - case 2609: - player.objectYOffset = 2; - break; - - case 4755: - player.objectYOffset = 1; - break; - - case 7056: - player.objectXOffset = 2; - break; - - case 26983: - case 26982: - case 24355: - case 24354: - player.objectYOffset = 1; - player.objectDistance = 0; - break; - - case 1722: - if (player.absX == 3159) { - player.objectXOffset = 3; - } else if (player.objectX == 3175 && player.objectY == 3420) { - player.objectXOffset = 1; - player.objectYOffset = 3; - } else if (player.objectX == 3177 && player.objectY == 3401) { - player.objectXOffset = 3; - player.objectYOffset = 1; - } else if (player.absY == 3298) { - player.objectYOffset = 3; - } - break; - - case 11666: - player.objectXOffset = -1; - player.objectYOffset = -1; - break; - - case 1723: - if (player.objectX == 3100 && player.objectY == 3266 - || player.objectX == 2663 && player.objectY == 3321) { - player.objectXOffset = 2; - player.objectYOffset = 1; - } else if (player.objectX == 3259 && player.objectY == 3447 - || player.objectX == 2590 && player.objectY == 3090 - || player.objectX == 3212 && player.objectY == 3474) { - player.objectYOffset = 2; - } else if (player.objectX == 2590 && player.objectY == 3085) { - player.objectXOffset = 1; - player.objectYOffset = 2; - } - break; - - case 1738: - if (player.objectX == 3204 && player.objectY == 3207 || player.objectX == 2648 && player.objectY == 3310) { - player.objectXOffset = 1; - player.objectYOffset = 2; - } else if (player.objectX == 3204 && player.objectY == 3229) { - player.objectXOffset = 2; - } else if (player.objectX == 2839 && player.objectY == 3537 || player.objectX == 2673 && player.objectY == 3300 || player.objectX == 2728 && player.objectY == 3460) { - player.objectXOffset = 2; - player.objectYOffset = 1; - } else if (player.absX == 2746) { - player.objectXOffset = 2; - } else if (player.objectX == 3010 && player.objectY == 3515 || player.objectX == 2648 && player.objectY == 3310) { - player.objectDistance = 2; - } else if (player.objectX == 2895 && player.objectY == 3513 || player.objectX == 3144 && player.objectY == 3447) { - player.objectDistance = 3; - } - break; - - case 1739: - if (player.objectX == 3204 && player.objectY == 3207) { - player.objectDistance = 3; - } else if (player.objectX == 3204 && player.objectY == 3229) { - player.objectXOffset = 2; - } else if (player.objectX == 3204 && player.objectY == 3207) { - player.objectXOffset = 1; - player.objectYOffset = 2; - } - break; - - case 1740: - if (player.objectX == 3205 && player.objectY == 3208) { - player.objectXOffset = 1; - player.objectYOffset = 2; - } else if (player.objectX == 3144 && player.objectY == 3448) { - player.objectDistance = 1; - } - break; - - case 12536: - player.objectXOffset = 2; - player.objectYOffset = 1; - break; - - case 12537: - player.objectXOffset = 1; - player.objectYOffset = 2; - break; - - case 12538: - player.objectYOffset = 1; - break; - - case 2287: - if (player.absX == 2552 && player.absY == 3561) { - player.objectYOffset = 2; - } else if (player.absX == 2552 && player.absY == 3558) { - player.objectYOffset = -1; - } - break; - - case 1734: - if (player.objectX == 2569 && player.objectY == 9522) { - player.objectXOffset = 1; - player.objectYOffset = 3; - } else if (player.objectX == 3187 && player.objectY == 9833) { - player.objectXOffset = 3; - player.objectYOffset = 1; - } - break; - - case 4493: - case 4494: - case 4495: - case 4496: - player.objectDistance = 5; - break; - - case 6522: - case 10229: - player.objectDistance = 2; - break; - - case 4417: - if (player.objectX == 2425 && player.objectY == 3074) { - player.objectYOffset = 2; - } - break; - - case 4420: - if (player.getX() >= 2383 && player.getX() <= 2385) { - player.objectYOffset = 1; - } else { - player.objectYOffset = -2; - } - // fall through - break; - - case 2878: - case 2879: - player.objectDistance = 3; - break; - - case 2558: - player.objectDistance = 0; - if (player.absX > player.objectX && player.objectX == 3044) { - player.objectXOffset = 1; - } - if (player.absY > player.objectY) { - player.objectYOffset = 1; - } - if (player.absX < player.objectX && player.objectX == 3038) { - player.objectXOffset = -1; - } - break; - - case 9356: - player.objectDistance = 2; - break; - - case 1815: - case 1816: - case 5959: - case 5960: - player.objectDistance = 0; - break; - - case 9293: - player.objectDistance = 2; - break; - - case 4418: - if (player.objectX == 2374 && player.objectY == 3131) { - player.objectYOffset = -2; - } else if (player.objectX == 2369 && player.objectY == 3126) { - player.objectXOffset = 2; - } else if (player.objectX == 2380 && player.objectY == 3127) { - player.objectYOffset = 2; - } else if (player.objectX == 2369 && player.objectY == 3126) { - player.objectXOffset = 2; - } else if (player.objectX == 2374 && player.objectY == 3131) { - player.objectYOffset = -2; - } - break; - - case 9706: - player.objectDistance = 0; - player.objectXOffset = 1; - break; - - case 9707: - player.objectDistance = 0; - player.objectYOffset = -1; - break; - - case 4419: - if (player.getX() >= 2417 && player.getX() <= 2418) { - player.objectYOffset = 3; - } else { - player.objectYOffset = -1; - player.objectXOffset = -3; - player.objectDistance = 3; - } - break; - - case 6707: - player.objectYOffset = 3; - break; - - case 6823: - player.objectDistance = 2; - player.objectYOffset = 1; - break; - - case 6706: - player.objectXOffset = 2; - break; - - case 6772: - player.objectDistance = 2; - player.objectYOffset = 1; - break; - - case 6705: - player.objectYOffset = -1; - break; - - case 6822: - player.objectDistance = 2; - player.objectYOffset = 1; - break; - - case 6704: - player.objectYOffset = -1; - break; - - case 6773: - player.objectDistance = 2; - player.objectXOffset = 1; - player.objectYOffset = 1; - break; - - case 6703: - player.objectXOffset = -1; - break; - - case 6771: - player.objectDistance = 2; - player.objectXOffset = 1; - player.objectYOffset = 1; - break; - - case 6702: - player.objectXOffset = -1; - break; - - case 6821: - player.objectDistance = 2; - player.objectXOffset = 1; - player.objectYOffset = 1; - break; - - /* - * case 1276: case 1278: case 1306: case 1307: case 1308: case 1309: - * case 1281: case 1319: case 1332: case 1318: case 1330: - * client.objectDistance = 3; break; - */ - - default: - player.objectDistance = 1; - player.objectXOffset = 0; - player.objectYOffset = 0; - break; - } - if (player.goodDistance(player.objectX + player.objectXOffset, - player.objectY + player.objectYOffset, player.getX(), - player.getY(), player.objectDistance)) { - player.getObjects().firstClickObject(player.objectId, - player.objectX, player.objectY); - } else { - player.clickObjectType = 1; - CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() { - @Override - public void execute(CycleEventContainer container) { - if (player.clickObjectType == 1 - && player.goodDistance(player.objectX - + player.objectXOffset, player.objectY - + player.objectYOffset, player.getX(), - player.getY(), player.objectDistance)) { - player.getObjects().firstClickObject( - player.objectId, player.objectX, - player.objectY); - container.stop(); - } - if (player.clickObjectType > 1 - || player.clickObjectType == 0) { - container.stop(); - } - } - - @Override - public void stop() { - player.clickObjectType = 0; - } - }, 1); } + player.getObjects().firstClickObject(player.objectId, player.objectX, player.objectY); break; - case SECOND_CLICK: - player.objectId = player.getInStream().readUnsignedWordBigEndianA(); - player.objectY = player.getInStream().readSignedWordBigEndian(); - player.objectX = player.getInStream().readUnsignedWordA(); - player.objectDistance = 1; + case 2: if (player.playerRights == 3) { player.getActionSender().sendMessage("ObjectId: " + player.objectId + " ObjectX: " + player.objectX + " ObjectY: " + player.objectY + " Objectclick = 2, Xoff: " + (player.getX() - player.objectX) + " Yoff: " + (player.getY() - player.objectY)); } @@ -997,155 +461,28 @@ public class ClickObject implements PacketType { Stalls.attemptStall(player, player.objectId, player.objectX, player.objectX); return; } - switch (player.objectId) { - case 6162: - case 6163: - case 6164: - case 6165: - case 6166: - case 9390: - player.objectDistance = 2; - break; - - case 12537: - player.objectDistance = 2; - break; - - case 2781: - if (player.objectX == 3272 && player.objectY == 3185) { - player.objectDistance = 3; - } - break; - - case 1739: - if (player.objectX == 3204 && player.objectY == 3207) { - player.objectDistance = 3; - } else if (player.objectX == 3204 && player.objectY == 3229) { - player.objectXOffset = 2; - } else if (player.objectX == 3204 && player.objectY == 3207) { - player.objectXOffset = 1; - player.objectYOffset = 2; - } - break; - - default: - player.objectDistance = 1; - player.objectXOffset = 0; - player.objectYOffset = 0; - break; - } - if (player.goodDistance(player.objectX + player.objectXOffset, player.objectY + player.objectYOffset, player.getX(), player.getY(), player.objectDistance)) { - player.getObjects().secondClickObject(player.objectId, player.objectX, player.objectY); - } else { - player.clickObjectType = 2; - CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() { - @Override - public void execute(CycleEventContainer container) { - if (player.clickObjectType == 2 && player.goodDistance(player.objectX + player.objectXOffset, player.objectY + player.objectYOffset, player.getX(), player.getY(), player.objectDistance)) { - player.getObjects().secondClickObject(player.objectId, player.objectX, player.objectY); - container.stop(); - } - if (player.clickObjectType != 2) { - container.stop(); - } - } - @Override - public void stop() { - player.clickObjectType = 0; - } - }, 1); - } + player.getObjects().secondClickObject(player.objectId, player.objectX, player.objectY); break; - case THIRD_CLICK: // 'F' - player.objectX = player.getInStream().readSignedWordBigEndian(); - player.objectY = player.getInStream().readUnsignedWord(); - player.objectId = player.getInStream().readUnsignedWordBigEndianA(); + case 3: // 'F' if (player.playerRights == 3) { player.getActionSender().sendMessage("ObjectId: " + player.objectId + " ObjectX: " + player.objectX + " ObjectY: " + player.objectY + " Objectclick = 3, Xoff: " + (player.getX() - player.objectX) + " Yoff: " + (player.getY() - player.objectY)); } - switch (player.objectId) { - case 12537: - player.objectDistance = 2; - break; - case 1739: - if (player.objectX == 3204 && player.objectY == 3207) { - player.objectDistance = 3; - } else if (player.objectX == 3204 && player.objectY == 3229) { - player.objectXOffset = 2; - } else if (player.objectX == 3204 && player.objectY == 3207) { - player.objectXOffset = 1; - player.objectYOffset = 2; - } - break; - default: - player.objectDistance = 1; - break; - } - player.objectXOffset = 0; - player.objectYOffset = 0; - if (player.goodDistance(player.objectX + player.objectXOffset, player.objectY + player.objectYOffset, player.getX(), player.getY(), player.objectDistance)) { - player.getObjects().thirdClickObject(player.objectId, player.objectX, player.objectY); - } else { - player.clickObjectType = 3; - CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() { - @Override - public void execute(CycleEventContainer container) { - if (player.clickObjectType == 3 && player.goodDistance(player.objectX + player.objectXOffset, player.objectY + player.objectYOffset, player.getX(), player.getY(), player.objectDistance)) { - player.getObjects().thirdClickObject(player.objectId, player.objectX, player.objectY); - container.stop(); - } - if (player.clickObjectType < 3) { - container.stop(); - } - } - @Override - public void stop() { - player.clickObjectType = 0; - } - }, 1); - } + player.getObjects().thirdClickObject(player.objectId, player.objectX, player.objectY); break; - case FOURTH_CLICK: - player.objectX = player.getInStream().readSignedWordBigEndianA(); - player.objectId = player.getInStream().readUnsignedWordA(); - player.objectY = player.getInStream().readUnsignedWordBigEndianA(); + case 4: if (player.playerRights == 3) { player.getActionSender().sendMessage("ObjectId: " + player.objectId + " ObjectX: " + player.objectX + " ObjectY: " + player.objectY + " Objectclick = 4, Xoff: " + (player.getX() - player.objectX) + " Yoff: " + (player.getY() - player.objectY)); } - switch (player.objectId) { - default: - player.objectDistance = 1; - break; - } - player.objectXOffset = 0; - player.objectYOffset = 0; - if (player.goodDistance(player.objectX + player.objectXOffset, player.objectY + player.objectYOffset, player.getX(), player.getY(), player.objectDistance)) { - player.getObjects().fourthClickObject(player.objectId, player.objectX, player.objectY); - } else { - player.clickObjectType = 4; - CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() { - @Override - public void execute(CycleEventContainer container) { - if (player.clickObjectType == 4 && player.goodDistance(player.objectX + player.objectXOffset, player.objectY + player.objectYOffset, player.getX(), player.getY(), player.objectDistance)) { - player.getObjects().fourthClickObject(player.objectId, player.objectX, player.objectY); - container.stop(); - } - if (player.clickObjectType < 4) { - container.stop(); - } - } - @Override - public void stop() { - player.clickObjectType = 0; - } - }, 1); - } + player.getObjects().fourthClickObject(player.objectId, player.objectX, player.objectY); break; } } + + + } diff --git a/2006Redone Server/src/redone/net/packets/impl/DropItem.java b/2006Redone Server/src/redone/net/packets/impl/DropItem.java index f9125058..4bfccd94 100644 --- a/2006Redone Server/src/redone/net/packets/impl/DropItem.java +++ b/2006Redone Server/src/redone/net/packets/impl/DropItem.java @@ -66,6 +66,9 @@ public class DropItem implements PacketType { "You can't drop items on tutorial island!"); return; } + + player.endCurrentTask(); + switch (itemId) { case 1560: if (!player.hasNpc) { diff --git a/2006Redone Server/src/redone/net/packets/impl/FollowPlayer.java b/2006Redone Server/src/redone/net/packets/impl/FollowPlayer.java index cca90be8..27bba90e 100644 --- a/2006Redone Server/src/redone/net/packets/impl/FollowPlayer.java +++ b/2006Redone Server/src/redone/net/packets/impl/FollowPlayer.java @@ -31,5 +31,6 @@ public class FollowPlayer implements PacketType { c.usingRangeWeapon = false; c.followDistance = 1; c.followId = followPlayer; + c.endCurrentTask(); } } diff --git a/2006Redone Server/src/redone/net/packets/impl/ItemClick2.java b/2006Redone Server/src/redone/net/packets/impl/ItemClick2.java index f35b5295..a0f99434 100644 --- a/2006Redone Server/src/redone/net/packets/impl/ItemClick2.java +++ b/2006Redone Server/src/redone/net/packets/impl/ItemClick2.java @@ -19,7 +19,9 @@ public class ItemClick2 implements PacketType { if (!c.getItemAssistant().playerHasItem(itemId, 1)) { return; } - + + c.endCurrentTask(); + if (HandleEmpty.canEmpty(c, itemId)) { HandleEmpty.handleEmptyItem(c, itemId, HandleEmpty.filledToEmpty(c, itemId)); return; diff --git a/2006Redone Server/src/redone/net/packets/impl/ItemClick2OnGroundItem.java b/2006Redone Server/src/redone/net/packets/impl/ItemClick2OnGroundItem.java index 116d383b..65d20199 100644 --- a/2006Redone Server/src/redone/net/packets/impl/ItemClick2OnGroundItem.java +++ b/2006Redone Server/src/redone/net/packets/impl/ItemClick2OnGroundItem.java @@ -18,6 +18,7 @@ public class ItemClick2OnGroundItem implements PacketType { c.getActionSender().sendMessage("You can't do that there!"); return; } + c.endCurrentTask(); for (LogData l : LogData.values()) { if (itemId == l.getLogId()) { Firemaking.attemptFire(c, 590, itemId, itemX, itemY, true); diff --git a/2006Redone Server/src/redone/net/packets/impl/ItemClick3.java b/2006Redone Server/src/redone/net/packets/impl/ItemClick3.java index f575c438..6d8e57e7 100644 --- a/2006Redone Server/src/redone/net/packets/impl/ItemClick3.java +++ b/2006Redone Server/src/redone/net/packets/impl/ItemClick3.java @@ -29,6 +29,9 @@ public class ItemClick3 implements PacketType { if (player.duelStatus > 0 && player.duelStatus < 5 || player.tradeStatus == 1) { return; } + + player.endCurrentTask(); + switch (itemId) { case 2552: diff --git a/2006Redone Server/src/redone/net/packets/impl/ItemOnGroundItem.java b/2006Redone Server/src/redone/net/packets/impl/ItemOnGroundItem.java index bf6bbec8..4234b910 100644 --- a/2006Redone Server/src/redone/net/packets/impl/ItemOnGroundItem.java +++ b/2006Redone Server/src/redone/net/packets/impl/ItemOnGroundItem.java @@ -23,6 +23,8 @@ public class ItemOnGroundItem implements PacketType { return; } + player.endCurrentTask(); + switch (itemUsed) { case 590: case 7331: diff --git a/2006Redone Server/src/redone/net/packets/impl/ItemOnItem.java b/2006Redone Server/src/redone/net/packets/impl/ItemOnItem.java index 6613ba62..577a8705 100644 --- a/2006Redone Server/src/redone/net/packets/impl/ItemOnItem.java +++ b/2006Redone Server/src/redone/net/packets/impl/ItemOnItem.java @@ -15,6 +15,7 @@ public class ItemOnItem implements PacketType { if (!player.getItemAssistant().playerHasItem(useWith, 1, usedWithSlot)|| !player.getItemAssistant().playerHasItem(itemUsed, 1, itemUsedSlot)) { return; } + player.endCurrentTask(); UseItem.ItemonItem(player, itemUsed, useWith); } diff --git a/2006Redone Server/src/redone/net/packets/impl/ItemOnNpc.java b/2006Redone Server/src/redone/net/packets/impl/ItemOnNpc.java index 614acccc..23435490 100644 --- a/2006Redone Server/src/redone/net/packets/impl/ItemOnNpc.java +++ b/2006Redone Server/src/redone/net/packets/impl/ItemOnNpc.java @@ -15,6 +15,7 @@ public class ItemOnNpc implements PacketType { final int slot = player.getInStream().readSignedWordBigEndian(); final int npcId = NpcHandler.npcs[i].npcType; SkillHandler.resetItemOnNpc(player); + player.endCurrentTask(); if (player.playerRights == 3) { player.getActionSender().sendMessage("Item id: " + itemId + " slot: " + slot + " i: " + i); } diff --git a/2006Redone Server/src/redone/net/packets/impl/ItemOnObject.java b/2006Redone Server/src/redone/net/packets/impl/ItemOnObject.java index 1327bdec..da95c7d4 100644 --- a/2006Redone Server/src/redone/net/packets/impl/ItemOnObject.java +++ b/2006Redone Server/src/redone/net/packets/impl/ItemOnObject.java @@ -26,6 +26,7 @@ public class ItemOnObject implements PacketType { player.turnPlayerTo(objectX, objectY); player.objectX = objectX; player.objectY = objectY; + player.endCurrentTask(); if (!player.getItemAssistant().playerHasItem(itemId, 1)) { return; } diff --git a/2006Redone Server/src/redone/net/packets/impl/ItemOnPlayer.java b/2006Redone Server/src/redone/net/packets/impl/ItemOnPlayer.java index 5fb5aace..75736448 100644 --- a/2006Redone Server/src/redone/net/packets/impl/ItemOnPlayer.java +++ b/2006Redone Server/src/redone/net/packets/impl/ItemOnPlayer.java @@ -16,6 +16,7 @@ public class ItemOnPlayer implements PacketType { public void processPacket(Client c, int packetType, int packetSize) { int playerId = c.inStream.readUnsignedWord(); int itemId = c.playerItems[c.inStream.readSignedWordBigEndian()] - 1; + c.endCurrentTask(); switch (itemId) { case 962: diff --git a/2006Redone Server/src/redone/net/packets/impl/MagicOnFloorItems.java b/2006Redone Server/src/redone/net/packets/impl/MagicOnFloorItems.java index 994354cb..108ff463 100644 --- a/2006Redone Server/src/redone/net/packets/impl/MagicOnFloorItems.java +++ b/2006Redone Server/src/redone/net/packets/impl/MagicOnFloorItems.java @@ -26,6 +26,7 @@ public class MagicOnFloorItems implements PacketType { return; } c.usingMagic = true; + c.endCurrentTask(); if (!c.getCombatAssistant().checkMagicReqs(51)) { c.stopMovement(); return; diff --git a/2006Redone Server/src/redone/net/packets/impl/MagicOnItems.java b/2006Redone Server/src/redone/net/packets/impl/MagicOnItems.java index 437b19ba..3dcdbb3a 100644 --- a/2006Redone Server/src/redone/net/packets/impl/MagicOnItems.java +++ b/2006Redone Server/src/redone/net/packets/impl/MagicOnItems.java @@ -14,6 +14,7 @@ public class MagicOnItems implements PacketType { int itemId = player.getInStream().readSignedWordA(); player.getInStream().readSignedWord(); int spellId = player.getInStream().readSignedWordA(); + player.endCurrentTask(); if(!player.getItemAssistant().playerHasItem(itemId, 1, slot)) { return; } diff --git a/2006Redone Server/src/redone/net/packets/impl/MoveItems.java b/2006Redone Server/src/redone/net/packets/impl/MoveItems.java index 5bb0164a..8589e6ba 100644 --- a/2006Redone Server/src/redone/net/packets/impl/MoveItems.java +++ b/2006Redone Server/src/redone/net/packets/impl/MoveItems.java @@ -28,5 +28,6 @@ public class MoveItems implements PacketType { return; } c.getItemAssistant().moveItems(from, to, interfaceId, insertMode); + c.endCurrentTask(); } } diff --git a/2006Redone Server/src/redone/net/packets/impl/PickupItem.java b/2006Redone Server/src/redone/net/packets/impl/PickupItem.java index ddd33621..160b6e71 100644 --- a/2006Redone Server/src/redone/net/packets/impl/PickupItem.java +++ b/2006Redone Server/src/redone/net/packets/impl/PickupItem.java @@ -32,6 +32,7 @@ public class PickupItem implements PacketType { return; } player.getCombatAssistant().resetPlayerAttack(); + player.endCurrentTask(); if (player.stopPlayerPacket) { return; } diff --git a/2006Redone Server/src/redone/net/packets/impl/RemoveItem.java b/2006Redone Server/src/redone/net/packets/impl/RemoveItem.java index e0c40aaa..9bed5563 100644 --- a/2006Redone Server/src/redone/net/packets/impl/RemoveItem.java +++ b/2006Redone Server/src/redone/net/packets/impl/RemoveItem.java @@ -23,6 +23,9 @@ public class RemoveItem implements PacketType { if (!RareProtection.removeItem(c, removeId)) { return; } + + c.endCurrentTask(); + switch (interfaceId) { case 4233: diff --git a/2006Redone Server/src/redone/net/packets/impl/Trade.java b/2006Redone Server/src/redone/net/packets/impl/Trade.java index 87d7ce31..1db92c58 100644 --- a/2006Redone Server/src/redone/net/packets/impl/Trade.java +++ b/2006Redone Server/src/redone/net/packets/impl/Trade.java @@ -14,6 +14,7 @@ public class Trade implements PacketType { public void processPacket(Client c, int packetType, int packetSize) { int tradeId = c.getInStream().readSignedWordBigEndian(); c.getPlayerAssistant().resetFollow(); + c.endCurrentTask(); if (c.disconnected) { c.tradeStatus = 0; } diff --git a/2006Redone Server/src/redone/net/packets/impl/Walking.java b/2006Redone Server/src/redone/net/packets/impl/Walking.java index a5326fc7..45917481 100644 --- a/2006Redone Server/src/redone/net/packets/impl/Walking.java +++ b/2006Redone Server/src/redone/net/packets/impl/Walking.java @@ -16,6 +16,7 @@ public class Walking implements PacketType { @Override public void processPacket(Client player, int packetType, int packetSize) { player.getDueling().checkDuelWalk(); + if (player.canChangeAppearance) { //|| c.performingAction) { return; } @@ -155,6 +156,9 @@ public class Walking implements PacketType { if (player.respawnTimer > 3) { return; } + + player.endCurrentTask(); + if (packetType == 248) { packetSize -= 14; } diff --git a/2006Redone Server/src/redone/net/packets/impl/WearItem.java b/2006Redone Server/src/redone/net/packets/impl/WearItem.java index cc94da84..5b0d62ad 100644 --- a/2006Redone Server/src/redone/net/packets/impl/WearItem.java +++ b/2006Redone Server/src/redone/net/packets/impl/WearItem.java @@ -29,6 +29,9 @@ public class WearItem implements PacketType { if (player.playerIndex > 0 || player.npcIndex > 0) { player.getCombatAssistant().resetPlayerAttack(); } + + player.endCurrentTask(); + if (player.wearId >= 5509 && player.wearId <= 5515) { int pouch = -1; int a = player.wearId; diff --git a/2006Redone Server/src/redone/world/clip/Region.java b/2006Redone Server/src/redone/world/clip/Region.java index a30573bc..3c1bf51b 100644 --- a/2006Redone Server/src/redone/world/clip/Region.java +++ b/2006Redone Server/src/redone/world/clip/Region.java @@ -28,7 +28,21 @@ public class Region { public static boolean blockedShot(int x, int y, int z) { return (getClipping(x, y, z) & 0x20000) == 0; } - + + public static Objects getObject(int id, int x, int y, int z) { + Region r = getRegion(x, y); + if (r == null) + return null; + for (Objects o : r.realObjects) { + if (o.objectId == id) { + if (o.objectX == x && o.objectY == y && o.objectHeight == z) { + return o; + } + } + } + return null; + } + public static boolean objectExists(int id, int x, int y, int z) { Region r = getRegion(x, y); if (r == null) diff --git a/CompiledServer/production/2006rebotted/redone/event/CycleEventHandler.class b/CompiledServer/production/2006rebotted/redone/event/CycleEventHandler.class index dceb7ac3..8a984978 100644 Binary files a/CompiledServer/production/2006rebotted/redone/event/CycleEventHandler.class and b/CompiledServer/production/2006rebotted/redone/event/CycleEventHandler.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/MemberShipHandler.class b/CompiledServer/production/2006rebotted/redone/game/content/MemberShipHandler.class index a128781a..c59a93f5 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/MemberShipHandler.class and b/CompiledServer/production/2006rebotted/redone/game/content/MemberShipHandler.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/combat/magic/CastOnOther.class b/CompiledServer/production/2006rebotted/redone/game/content/combat/magic/CastOnOther.class index a2b7ff07..4879bb4a 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/combat/magic/CastOnOther.class and b/CompiledServer/production/2006rebotted/redone/game/content/combat/magic/CastOnOther.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/combat/range/DwarfCannon.class b/CompiledServer/production/2006rebotted/redone/game/content/combat/range/DwarfCannon.class index f6e6f78d..2dcf826d 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/combat/range/DwarfCannon.class and b/CompiledServer/production/2006rebotted/redone/game/content/combat/range/DwarfCannon.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/consumables/Beverages.class b/CompiledServer/production/2006rebotted/redone/game/content/consumables/Beverages.class index 3b203a6a..b49bb04c 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/consumables/Beverages.class and b/CompiledServer/production/2006rebotted/redone/game/content/consumables/Beverages.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/consumables/Potions.class b/CompiledServer/production/2006rebotted/redone/game/content/consumables/Potions.class index 7f90b8bd..facabbe6 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/consumables/Potions.class and b/CompiledServer/production/2006rebotted/redone/game/content/consumables/Potions.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/guilds/Guilds.class b/CompiledServer/production/2006rebotted/redone/game/content/guilds/Guilds.class index ca200585..5cb615f5 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/guilds/Guilds.class and b/CompiledServer/production/2006rebotted/redone/game/content/guilds/Guilds.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/guilds/impl/RangersGuild.class b/CompiledServer/production/2006rebotted/redone/game/content/guilds/impl/RangersGuild.class index e8345fd4..bde8bbfc 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/guilds/impl/RangersGuild.class and b/CompiledServer/production/2006rebotted/redone/game/content/guilds/impl/RangersGuild.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/minigames/FightCaves.class b/CompiledServer/production/2006rebotted/redone/game/content/minigames/FightCaves.class index 5fdc8844..af43c71c 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/minigames/FightCaves.class and b/CompiledServer/production/2006rebotted/redone/game/content/minigames/FightCaves.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/minigames/trawler/Trawler.class b/CompiledServer/production/2006rebotted/redone/game/content/minigames/trawler/Trawler.class index 9de746e5..fbf3918c 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/minigames/trawler/Trawler.class and b/CompiledServer/production/2006rebotted/redone/game/content/minigames/trawler/Trawler.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/minigames/trawler/WaitingRoom.class b/CompiledServer/production/2006rebotted/redone/game/content/minigames/trawler/WaitingRoom.class index f0076df3..a8a0cec3 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/minigames/trawler/WaitingRoom.class and b/CompiledServer/production/2006rebotted/redone/game/content/minigames/trawler/WaitingRoom.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/random/Holidays.class b/CompiledServer/production/2006rebotted/redone/game/content/random/Holidays.class index d1e48b88..1e053ab0 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/random/Holidays.class and b/CompiledServer/production/2006rebotted/redone/game/content/random/Holidays.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/agility/Agility.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/agility/Agility.class index da2d7f82..6797a464 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/agility/Agility.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/agility/Agility.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/agility/ApeAtollAgility.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/agility/ApeAtollAgility.class index 614ae450..60d49fa3 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/agility/ApeAtollAgility.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/agility/ApeAtollAgility.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/agility/BarbarianAgility.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/agility/BarbarianAgility.class index f64ed52c..9e14b449 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/agility/BarbarianAgility.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/agility/BarbarianAgility.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/agility/PyramidAgility.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/agility/PyramidAgility.class index 89c8a24a..b8babc4d 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/agility/PyramidAgility.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/agility/PyramidAgility.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/agility/WerewolfAgility.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/agility/WerewolfAgility.class index 8928ec93..bdd877cb 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/agility/WerewolfAgility.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/agility/WerewolfAgility.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/agility/WildernessAgility.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/agility/WildernessAgility.class index e8a75358..e0844924 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/agility/WildernessAgility.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/agility/WildernessAgility.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/cooking/Cooking.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/cooking/Cooking.class index b0cb1d1d..c18a5290 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/cooking/Cooking.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/cooking/Cooking.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/cooking/CookingTutorialIsland.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/cooking/CookingTutorialIsland.class index 8b884152..b44adfcb 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/cooking/CookingTutorialIsland.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/cooking/CookingTutorialIsland.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Fishing.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Fishing.class index a4d7124f..87f2aa84 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Fishing.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Fishing.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Mining$rockData.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Mining$rockData.class index 39f4b166..663dec3b 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Mining$rockData.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Mining$rockData.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Mining.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Mining.class index abf875c4..08d74fb5 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Mining.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Mining.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Prayer.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Prayer.class index c91f5ccc..2ab95f7f 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Prayer.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Prayer.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Woodcutting$2.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Woodcutting$2.class index 834ce6db..33425150 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Woodcutting$2.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Woodcutting$2.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Woodcutting.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Woodcutting.class index 89d7e9b2..271fbbf0 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Woodcutting.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Woodcutting.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/crafting/GemCutting.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/crafting/GemCutting.class index 8b9947bb..44f95336 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/crafting/GemCutting.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/crafting/GemCutting.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/crafting/GlassBlowing.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/crafting/GlassBlowing.class index 44734692..15db20ad 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/crafting/GlassBlowing.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/crafting/GlassBlowing.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/crafting/LeatherMaking.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/crafting/LeatherMaking.class index be2a505f..ff699298 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/crafting/LeatherMaking.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/crafting/LeatherMaking.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/crafting/Pottery.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/crafting/Pottery.class index 64f60f8c..3ce0ab8a 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/crafting/Pottery.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/crafting/Pottery.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/crafting/SoftClay.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/crafting/SoftClay.class index 376d6aa1..77bcd3e8 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/crafting/SoftClay.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/crafting/SoftClay.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/crafting/Spinning.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/crafting/Spinning.class index 6baed624..9aca8c82 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/crafting/Spinning.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/crafting/Spinning.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/firemaking/Firemaking$1.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/firemaking/Firemaking$1.class index 7d36e8a6..d2f48037 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/firemaking/Firemaking$1.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/firemaking/Firemaking$1.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/firemaking/Firemaking.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/firemaking/Firemaking.class index 73ade57c..603b64b7 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/firemaking/Firemaking.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/firemaking/Firemaking.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/fletching/ArrowMaking.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/fletching/ArrowMaking.class index d8d971b4..a5ae8643 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/fletching/ArrowMaking.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/fletching/ArrowMaking.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/fletching/LogCutting.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/fletching/LogCutting.class index e95a2de8..fdb6bec4 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/fletching/LogCutting.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/fletching/LogCutting.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/fletching/Stringing.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/fletching/Stringing.class index 400b82a4..4fae10e8 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/fletching/Stringing.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/fletching/Stringing.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/herblore/Herblore.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/herblore/Herblore.class index df5933d2..4bc0d55c 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/herblore/Herblore.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/herblore/Herblore.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/smithing/SilverCrafting.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/smithing/SilverCrafting.class index c12ae8af..d7b928de 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/smithing/SilverCrafting.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/smithing/SilverCrafting.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/smithing/Smelting.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/smithing/Smelting.class index 5c89a336..474bed0a 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/smithing/Smelting.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/smithing/Smelting.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/thieving/Pickpocket.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/thieving/Pickpocket.class index 69334247..8db4e094 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/thieving/Pickpocket.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/thieving/Pickpocket.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/thieving/Stalls.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/thieving/Stalls.class index b9f551b3..e8ae6460 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/thieving/Stalls.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/thieving/Stalls.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/thieving/ThieveOther.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/thieving/ThieveOther.class index ac71a4cf..620facd5 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/thieving/ThieveOther.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/thieving/ThieveOther.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/traveling/Desert.class b/CompiledServer/production/2006rebotted/redone/game/content/traveling/Desert.class index 28096b3d..c159e092 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/traveling/Desert.class and b/CompiledServer/production/2006rebotted/redone/game/content/traveling/Desert.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/traveling/GnomeGlider.class b/CompiledServer/production/2006rebotted/redone/game/content/traveling/GnomeGlider.class index 044e88c9..215db6a9 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/traveling/GnomeGlider.class and b/CompiledServer/production/2006rebotted/redone/game/content/traveling/GnomeGlider.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/traveling/Sailing.class b/CompiledServer/production/2006rebotted/redone/game/content/traveling/Sailing.class index 5ff1576b..1133b2fb 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/traveling/Sailing.class and b/CompiledServer/production/2006rebotted/redone/game/content/traveling/Sailing.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/globalworldobjects/PassDoor.class b/CompiledServer/production/2006rebotted/redone/game/globalworldobjects/PassDoor.class index 1ae8d42b..a29e9f2b 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/globalworldobjects/PassDoor.class and b/CompiledServer/production/2006rebotted/redone/game/globalworldobjects/PassDoor.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/items/impl/Flowers.class b/CompiledServer/production/2006rebotted/redone/game/items/impl/Flowers.class index 5f153bcd..0595eab6 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/items/impl/Flowers.class and b/CompiledServer/production/2006rebotted/redone/game/items/impl/Flowers.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/npcs/Npc.class b/CompiledServer/production/2006rebotted/redone/game/npcs/Npc.class index 657db026..8215f6ec 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/npcs/Npc.class and b/CompiledServer/production/2006rebotted/redone/game/npcs/Npc.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/npcs/NpcActions.class b/CompiledServer/production/2006rebotted/redone/game/npcs/NpcActions.class index aa5bc346..3c993f95 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/npcs/NpcActions.class and b/CompiledServer/production/2006rebotted/redone/game/npcs/NpcActions.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/npcs/impl/MilkCow.class b/CompiledServer/production/2006rebotted/redone/game/npcs/impl/MilkCow.class index 3f9d742b..9269fa00 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/npcs/impl/MilkCow.class and b/CompiledServer/production/2006rebotted/redone/game/npcs/impl/MilkCow.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/objects/Objects.class b/CompiledServer/production/2006rebotted/redone/game/objects/Objects.class index 59505a23..40bd20f8 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/objects/Objects.class and b/CompiledServer/production/2006rebotted/redone/game/objects/Objects.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/objects/ObjectsActions.class b/CompiledServer/production/2006rebotted/redone/game/objects/ObjectsActions.class index 442e59ef..09de52ce 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/objects/ObjectsActions.class and b/CompiledServer/production/2006rebotted/redone/game/objects/ObjectsActions.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/objects/impl/Climbing.class b/CompiledServer/production/2006rebotted/redone/game/objects/impl/Climbing.class index 30940177..9a2a34f4 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/objects/impl/Climbing.class and b/CompiledServer/production/2006rebotted/redone/game/objects/impl/Climbing.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/objects/impl/CrystalChest.class b/CompiledServer/production/2006rebotted/redone/game/objects/impl/CrystalChest.class index bfafe5d7..b1581647 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/objects/impl/CrystalChest.class and b/CompiledServer/production/2006rebotted/redone/game/objects/impl/CrystalChest.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/objects/impl/FlourMill.class b/CompiledServer/production/2006rebotted/redone/game/objects/impl/FlourMill.class index 42e842d1..2eab9533 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/objects/impl/FlourMill.class and b/CompiledServer/production/2006rebotted/redone/game/objects/impl/FlourMill.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/objects/impl/Levers.class b/CompiledServer/production/2006rebotted/redone/game/objects/impl/Levers.class index 37615e3c..9dce3149 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/objects/impl/Levers.class and b/CompiledServer/production/2006rebotted/redone/game/objects/impl/Levers.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/objects/impl/OtherObjects$2.class b/CompiledServer/production/2006rebotted/redone/game/objects/impl/OtherObjects$2.class index aa884187..6f687884 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/objects/impl/OtherObjects$2.class and b/CompiledServer/production/2006rebotted/redone/game/objects/impl/OtherObjects$2.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/objects/impl/OtherObjects$3.class b/CompiledServer/production/2006rebotted/redone/game/objects/impl/OtherObjects$3.class index 089caaa2..43c19d98 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/objects/impl/OtherObjects$3.class and b/CompiledServer/production/2006rebotted/redone/game/objects/impl/OtherObjects$3.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/objects/impl/OtherObjects.class b/CompiledServer/production/2006rebotted/redone/game/objects/impl/OtherObjects.class index fcd10002..db6752a0 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/objects/impl/OtherObjects.class and b/CompiledServer/production/2006rebotted/redone/game/objects/impl/OtherObjects.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/objects/impl/Pickable.class b/CompiledServer/production/2006rebotted/redone/game/objects/impl/Pickable.class index af4948f1..03afe41b 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/objects/impl/Pickable.class and b/CompiledServer/production/2006rebotted/redone/game/objects/impl/Pickable.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/Client$1.class b/CompiledServer/production/2006rebotted/redone/game/players/Client$1.class index 605b4b20..cbfbcb1b 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/Client$1.class and b/CompiledServer/production/2006rebotted/redone/game/players/Client$1.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/Client$2.class b/CompiledServer/production/2006rebotted/redone/game/players/Client$2.class index 570e2214..6b1a986d 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/Client$2.class and b/CompiledServer/production/2006rebotted/redone/game/players/Client$2.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/Client$3.class b/CompiledServer/production/2006rebotted/redone/game/players/Client$3.class index 302b03f7..a618331f 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/Client$3.class and b/CompiledServer/production/2006rebotted/redone/game/players/Client$3.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/Client$4.class b/CompiledServer/production/2006rebotted/redone/game/players/Client$4.class index f9227ff7..674bf967 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/Client$4.class and b/CompiledServer/production/2006rebotted/redone/game/players/Client$4.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/Client$TinterfaceText.class b/CompiledServer/production/2006rebotted/redone/game/players/Client$TinterfaceText.class index 8b58739b..5b6d718c 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/Client$TinterfaceText.class and b/CompiledServer/production/2006rebotted/redone/game/players/Client$TinterfaceText.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/Client.class b/CompiledServer/production/2006rebotted/redone/game/players/Client.class index 67879d5e..358a130f 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/Client.class and b/CompiledServer/production/2006rebotted/redone/game/players/Client.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/Player.class b/CompiledServer/production/2006rebotted/redone/game/players/Player.class index 5f0f60e4..6b07df3c 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/Player.class and b/CompiledServer/production/2006rebotted/redone/game/players/Player.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$1.class b/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$1.class index 8bfa2767..9b311e7b 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$1.class and b/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$1.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant.class b/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant.class index 2e8f9583..e331587d 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant.class and b/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/Trading.class b/CompiledServer/production/2006rebotted/redone/game/players/Trading.class index 4bd16d58..bf52be8f 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/Trading.class and b/CompiledServer/production/2006rebotted/redone/game/players/Trading.class differ diff --git a/CompiledServer/production/2006rebotted/redone/integrations/PlayersOnlineWebsite.class b/CompiledServer/production/2006rebotted/redone/integrations/PlayersOnlineWebsite.class index 9e4c458e..ce6d1bb4 100644 Binary files a/CompiledServer/production/2006rebotted/redone/integrations/PlayersOnlineWebsite.class and b/CompiledServer/production/2006rebotted/redone/integrations/PlayersOnlineWebsite.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/AttackPlayer.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/AttackPlayer.class index ef55539c..10d3af79 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/AttackPlayer.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/AttackPlayer.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/Bank10.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/Bank10.class index ceefc102..71bc42f4 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/Bank10.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/Bank10.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/Bank5.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/Bank5.class index fd972cea..1b89d395 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/Bank5.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/Bank5.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/BankAll.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/BankAll.class index 614676c3..1516b618 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/BankAll.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/BankAll.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/BankX1.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/BankX1.class index 985b2e83..2caed26c 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/BankX1.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/BankX1.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/BankX2.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/BankX2.class index 8cc8c3ec..17c1b968 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/BankX2.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/BankX2.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ChangeAppearance.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ChangeAppearance.class index f7d5b2c5..2941f422 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ChangeAppearance.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ChangeAppearance.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickItem.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickItem.class index 5163db04..19d4bcc5 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickItem.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickItem.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickNPC$1.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickNPC$1.class index 6db480b4..29752af0 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickNPC$1.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickNPC$1.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickNPC$2.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickNPC$2.class index a3a83d41..1262b2f4 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickNPC$2.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickNPC$2.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickNPC$3.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickNPC$3.class index 13351a60..63ac83fc 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickNPC$3.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickNPC$3.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickNPC.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickNPC.class index b6e42bd9..c1b19371 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickNPC.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickNPC.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$1.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$1.class index a9e92835..ae69f4e8 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$1.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$1.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$2.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$2.class index ad9b95d7..71c2a904 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$2.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$2.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$3.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$3.class index a59f9ad0..e2df5932 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$3.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$3.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$4.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$4.class index 2c5d488a..b207c3f2 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$4.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$4.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$5.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$5.class index 1c75b0ce..378d23fa 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$5.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$5.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$6.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$6.class index c5ca5638..d9b3e20b 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$6.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$6.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$7.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$7.class deleted file mode 100644 index abd82a7b..00000000 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$7.class and /dev/null differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$8.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$8.class deleted file mode 100644 index 0d9bca8c..00000000 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$8.class and /dev/null differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$9.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$9.class deleted file mode 100644 index 2caff666..00000000 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject$9.class and /dev/null differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject.class index 2d8a51ef..b46f4e52 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ClickObject.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/Commands$1.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/Commands$1.class index 964305cc..3949d210 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/Commands$1.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/Commands$1.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/Commands.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/Commands.class index 8c36bb62..b99bacb7 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/Commands.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/Commands.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/DropItem.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/DropItem.class index c71cafe9..92c37c32 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/DropItem.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/DropItem.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/FollowPlayer.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/FollowPlayer.class index b8a5b46d..40d677b7 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/FollowPlayer.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/FollowPlayer.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemClick2.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemClick2.class index 70f36e5c..bf9c022d 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemClick2.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemClick2.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemClick2OnGroundItem.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemClick2OnGroundItem.class index ff783103..ea8d9844 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemClick2OnGroundItem.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemClick2OnGroundItem.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemClick3.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemClick3.class index 1c4c1a9f..5c0cf71e 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemClick3.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemClick3.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemOnGroundItem.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemOnGroundItem.class index 18207bbc..8f81f88c 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemOnGroundItem.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemOnGroundItem.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemOnItem.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemOnItem.class index 81b087c2..3073b7e7 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemOnItem.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemOnItem.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemOnNpc.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemOnNpc.class index a943ca3f..e7addcd9 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemOnNpc.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemOnNpc.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemOnObject.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemOnObject.class index 8488e8c7..354b888f 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemOnObject.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemOnObject.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemOnPlayer.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemOnPlayer.class index 80218e1b..8ab4d734 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemOnPlayer.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/ItemOnPlayer.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/MagicOnFloorItems$1.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/MagicOnFloorItems$1.class index 954e12d4..9178cc79 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/MagicOnFloorItems$1.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/MagicOnFloorItems$1.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/MagicOnFloorItems.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/MagicOnFloorItems.class index cb91f4c6..c193dce1 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/MagicOnFloorItems.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/MagicOnFloorItems.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/MagicOnItems.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/MagicOnItems.class index f74d19cd..42ffb209 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/MagicOnItems.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/MagicOnItems.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/MoveItems.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/MoveItems.class index 9ee860b3..221107cc 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/MoveItems.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/MoveItems.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/PickupItem$1.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/PickupItem$1.class index 01d7fb40..db95d442 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/PickupItem$1.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/PickupItem$1.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/PickupItem.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/PickupItem.class index 72e1a9d8..c8e4da13 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/PickupItem.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/PickupItem.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/RemoveItem.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/RemoveItem.class index 845c5c8b..5d11a51b 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/RemoveItem.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/RemoveItem.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/Trade.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/Trade.class index 1c231956..31f69c26 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/Trade.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/Trade.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/Walking.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/Walking.class index 844ee405..a8a9cb6d 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/Walking.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/Walking.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/WearItem.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/WearItem.class index db632e51..c320dfb7 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/WearItem.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/WearItem.class differ diff --git a/CompiledServer/production/2006rebotted/redone/world/GlobalDropsHandler.class b/CompiledServer/production/2006rebotted/redone/world/GlobalDropsHandler.class index c813c1c7..9fb27949 100644 Binary files a/CompiledServer/production/2006rebotted/redone/world/GlobalDropsHandler.class and b/CompiledServer/production/2006rebotted/redone/world/GlobalDropsHandler.class differ diff --git a/CompiledServer/production/2006rebotted/redone/world/ObjectManager.class b/CompiledServer/production/2006rebotted/redone/world/ObjectManager.class index 30af085a..c67cf5b2 100644 Binary files a/CompiledServer/production/2006rebotted/redone/world/ObjectManager.class and b/CompiledServer/production/2006rebotted/redone/world/ObjectManager.class differ diff --git a/CompiledServer/production/2006rebotted/redone/world/clip/Region.class b/CompiledServer/production/2006rebotted/redone/world/clip/Region.class index 6c390a17..d4f3c040 100644 Binary files a/CompiledServer/production/2006rebotted/redone/world/clip/Region.class and b/CompiledServer/production/2006rebotted/redone/world/clip/Region.class differ