remove deleteItem2 → deleteItem (#212)

2006Redone Server/src/redone/game/content/combat/magic/CastRequirements.java

@@ -28,7 +28,7 @@ public class CastRequirements {
 	public static void deleteRunes(Client c, int[][] runes) {
 		for (int[] rune : runes) {
 			if (!MagicRequirements.wearingStaff(c, rune[0])) {
-				c.getItemAssistant().deleteItem2(rune[0], rune[1]);
+				c.getItemAssistant().deleteItem(rune[0], rune[1]);
 			}
 		}
 	}

2006Redone Server/src/redone/game/content/combat/magic/MagicTeleports.java

@@ -1,6 +1,5 @@
 package redone.game.content.combat.magic;
 
-import redone.game.content.quests.QuestAssistant;
 import redone.game.content.randomevents.RandomEventHandler;
 import redone.game.players.Client;
 import redone.util.Misc;
@@ -419,7 +418,7 @@ public class MagicTeleports {
 			}
 		}
 		CastRequirements.deleteRunes(player, new int[][]{{LAW_RUNE, 2}, {FIRE_RUNE, 2}, {WATER_RUNE, 2}});
-		player.getItemAssistant().deleteItem2(BANANA, 1);
+		player.getItemAssistant().deleteItem(BANANA, 1);
 		player.getPlayerAssistant().startTeleport(2798 + Misc.random(1), 2798 - Misc.random(1), 1, "modern");
 		player.getPlayerAssistant().addSkillXP(76, player.playerMagic);
 	}

2006Redone Server/src/redone/game/content/guilds/impl/RangersGuild.java

@@ -343,7 +343,7 @@ public class RangersGuild {
 			if (c.getItemAssistant().playerHasItem(995, 200)) {
 				if (c.getItemAssistant().freeSlots() > 1) {
 					arrowsLeft = 10;
-					c.getItemAssistant().deleteItem2(995, 200);
+					c.getItemAssistant().deleteItem(995, 200);
 					c.getItemAssistant().addItem(ARROWS_REQ, 10);
 					c.getItemAssistant().addItem(841, 1);
 					c.getDialogueHandler().sendStatement("The archer hands you 10 bronze arrows and a bow.");

2006Redone Server/src/redone/game/content/minigames/castlewars/CastleWars.java

@@ -757,7 +757,7 @@ public class CastleWars {
 		//4049, 4045, 4053, 4042, 4041, 4037, 4039
 		for (int item : items) {
 			if (player.getItemAssistant().playerHasItem(item)) {
-				player.getItemAssistant().deleteItem2(item,
+				player.getItemAssistant().deleteItem(item,
 						player.getItemAssistant().getItemAmount(item));
 			}
 		}

2006Redone Server/src/redone/game/content/minigames/trawler/Trawler.java

@@ -427,7 +427,7 @@ public class Trawler extends GroupMinigame {
                         if (p.getItemAssistant().playerHasItem(swamp_paste)) {
                                 int index = Wall.getIndex(x, y);
                                 if (index >= 0) {
-                                        p.getItemAssistant().deleteItem2(swamp_paste, 1);
+                                        p.getItemAssistant().deleteItem(swamp_paste, 1);
                                         p.startAnimation(832);
                                         wall_status[index] = false;
                                         updateWall(index);

2006Redone Server/src/redone/game/content/random/PartyRoom.java

@@ -182,7 +182,7 @@ public class PartyRoom {
 					"You cant deposit more than 8 items at once.");
 			return;
 		}
-		c.getItemAssistant().deleteItem2(id, amount);
+		c.getItemAssistant().deleteItem(id, amount);
 		if (c.party[slot] != id) {
 			c.party[slot] = id;
 			c.partyN[slot] = amount;

2006Redone Server/src/redone/game/content/randomevents/FreakyForester.java

@@ -39,7 +39,7 @@ public class FreakyForester {
 				client.getActionSender().sendMessage("You have already beat the freaky forester event so you get 500 coins.");
 			}
 			int delete = client.getItemAssistant().getItemCount(6178);
-			client.getItemAssistant().deleteItem2(6178, delete);
+			client.getItemAssistant().deleteItem(6178, delete);
 			client.randomActions = 0;
 		} else {
 			RandomEventHandler.failEvent(client);

2006Redone Server/src/redone/game/content/skills/crafting/GemCutting.java

@@ -40,7 +40,7 @@ public class GemCutting extends CraftingData {
 						if (Misc.random(2) == 0 && itemUsed > 1624 && itemUsed < 1630 || usedWith > 1624 && usedWith < 1630 && Misc.random(2) == 0) {
 							c.getActionSender().sendMessage("You fail to cut the gem.");
 							c.getItemAssistant().addItem(1633, 1);
-							c.getItemAssistant().deleteItem2(itemId, 1);
+							c.getItemAssistant().deleteItem(itemId, 1);
 							c.getPlayerAssistant().addSkillXP(1, 12);
 						}
 						if (c.isCrafting == true) {

2006Redone Server/src/redone/game/content/skills/crafting/Pottery.java

@@ -56,7 +56,7 @@ public class Pottery {
 		if (c.getItemAssistant().playerHasItem(softClay)
 				&& c.playerLevel[12] >= level && c.isPotCrafting == true) {
 			c.startAnimation(unFire);
-			c.getItemAssistant().deleteItem2(softClay, 1);
+			c.getItemAssistant().deleteItem(softClay, 1);
 			c.getItemAssistant().addItem(id, 1);
 			c.getActionSender().sendMessage(
 					"You make the soft clay into a "
@@ -72,7 +72,7 @@ public class Pottery {
 						&& c.playerLevel[12] >= level && !(c.doAmount <= 0)
 						&& c.isPotCrafting == true) {
 					c.startAnimation(unFire);
-					c.getItemAssistant().deleteItem2(softClay, 1);
+					c.getItemAssistant().deleteItem(softClay, 1);
 					c.getItemAssistant().addItem(id, 1);
 					c.getActionSender().sendMessage(
 							"You make the soft clay into a "
@@ -119,7 +119,7 @@ public class Pottery {
 		c.isPotCrafting = true;
 		if (c.getItemAssistant().playerHasItem(startId)
 				&& c.playerLevel[12] >= level && c.isPotCrafting == true) {
-			c.getItemAssistant().deleteItem2(startId, 1);
+			c.getItemAssistant().deleteItem(startId, 1);
 			c.getItemAssistant().addItem(finishId, 1);
 			c.startAnimation(Fire);
 			c.getActionSender().sendSound(469, 100, 0);
@@ -152,7 +152,7 @@ public class Pottery {
 				if (c.getItemAssistant().playerHasItem(startId)
 						&& c.playerLevel[12] >= level
 						&& c.isPotCrafting == true && !(c.doAmount <= 0)) {
-					c.getItemAssistant().deleteItem2(startId, 1);
+					c.getItemAssistant().deleteItem(startId, 1);
 					c.getItemAssistant().addItem(finishId, 1);
 					c.startAnimation(Fire);
 					c.getActionSender().sendSound(469, 100, 0);

2006Redone Server/src/redone/game/content/skills/fletching/ArrowMaking.java

@@ -127,8 +127,8 @@ public class ArrowMaking {
 				if (c.isWoodcutting == true) {
 					container.stop();
 				}
-				c.getItemAssistant().deleteItem2(arrowData.getItem1(), count);
+				c.getItemAssistant().deleteItem(arrowData.getItem1(), count);
-				c.getItemAssistant().deleteItem2(arrowData.getItem2(), count);
+				c.getItemAssistant().deleteItem(arrowData.getItem2(), count);
 				c.getItemAssistant().addItem(arrowData.getProduct(),
 						count / multiplier);
 				c.getActionSender().sendMessage(

2006Redone Server/src/redone/game/content/skills/fletching/LogCutting.java

@@ -47,7 +47,7 @@ public class LogCutting {
 			@Override
 			public void execute(CycleEventContainer container) {
 				if (c.getItemAssistant().playerHasItem(LogCuttingInterface.log) && c.getItemAssistant().playerHasItem(KNIFE)) {
-					c.getItemAssistant().deleteItem2(LogCuttingInterface.log, 1);
+					c.getItemAssistant().deleteItem(LogCuttingInterface.log, 1);
 					if (product == 52) {
 						c.getItemAssistant().addItem(product, 15);
 					} else {
@@ -333,7 +333,7 @@ public class LogCutting {
 				return;
 			}
 			c.startAnimation(1248);
-			c.getItemAssistant().deleteItem2(2859, amount);
+			c.getItemAssistant().deleteItem(2859, amount);
 			c.getItemAssistant().addItem(2861, makeAmount);
 			c.getPlayerAssistant().addSkillXP(3 * amount, c.playerFletching);
 			c.getActionSender().sendMessage(
@@ -362,8 +362,8 @@ public class LogCutting {
 					.getItemAssistant().getItemCount(2864);
 			if (feather == arrowShaft * 4) {
 				c.startAnimation(1248);
-				c.getItemAssistant().deleteItem2(314, feather * 4);
+				c.getItemAssistant().deleteItem(314, feather * 4);
-				c.getItemAssistant().deleteItem2(2864, arrowShaft);
+				c.getItemAssistant().deleteItem(2864, arrowShaft);
 				c.getItemAssistant().addItem(2865, arrowShaft);
 				c.getActionSender().sendMessage(
 						"You turn your " + ItemAssistant.getItemName(2864)
@@ -416,8 +416,8 @@ public class LogCutting {
 				c.getItemAssistant().addItem(2866, wolfBoneArrow);
 				c.getPlayerAssistant().addSkillXP(1 * wolfBoneArrow,
 						c.playerFletching);
-				c.getItemAssistant().deleteItem2(2861, wolfBoneArrow);
+				c.getItemAssistant().deleteItem(2861, wolfBoneArrow);
-				c.getItemAssistant().deleteItem2(2865, wolfBoneArrow);
+				c.getItemAssistant().deleteItem(2865, wolfBoneArrow);
 				c.getActionSender().sendMessage(
 						"You turn your " + ItemAssistant.getItemName(2865)
 								+ " (s) into "
@@ -427,8 +427,8 @@ public class LogCutting {
 				c.getItemAssistant().addItem(2866, flightedArrow);
 				c.getPlayerAssistant().addSkillXP(1 * flightedArrow,
 						c.playerFletching);
-				c.getItemAssistant().deleteItem2(2861, flightedArrow);
+				c.getItemAssistant().deleteItem(2861, flightedArrow);
-				c.getItemAssistant().deleteItem2(2865, flightedArrow);
+				c.getItemAssistant().deleteItem(2865, flightedArrow);
 				c.getActionSender().sendMessage(
 						"You turn your " + ItemAssistant.getItemName(2865)
 								+ " (s) into "
@@ -438,8 +438,8 @@ public class LogCutting {
 				c.getItemAssistant().addItem(2866, wolfBoneArrow);
 				c.getPlayerAssistant().addSkillXP(1 * wolfBoneArrow,
 						c.playerFletching);
-				c.getItemAssistant().deleteItem2(2861, wolfBoneArrow);
+				c.getItemAssistant().deleteItem(2861, wolfBoneArrow);
-				c.getItemAssistant().deleteItem2(2865, wolfBoneArrow);
+				c.getItemAssistant().deleteItem(2865, wolfBoneArrow);
 				c.getActionSender().sendMessage(
 						"You turn your " + ItemAssistant.getItemName(2865)
 								+ " (s) into "
@@ -461,7 +461,7 @@ public class LogCutting {
 				return;
 			}
 			c.startAnimation(1248);
-			c.getItemAssistant().deleteItem2(2862, amount);
+			c.getItemAssistant().deleteItem(2862, amount);
 			c.getItemAssistant().addItem(2864, makeAmount);
 			c.getPlayerAssistant().addSkillXP(2 * amount, c.playerFletching);
 			c.getActionSender().sendMessage(

2006Redone Server/src/redone/game/content/skills/fletching/Stringing.java

@@ -101,8 +101,8 @@ public class Stringing {
 					container.stop();
 					return;
 				}
-				c.getItemAssistant().deleteItem2(loadData.getItem1(), 1);
+				c.getItemAssistant().deleteItem(loadData.getItem1(), 1);
-				c.getItemAssistant().deleteItem2(loadData.getItem2(), 1);
+				c.getItemAssistant().deleteItem(loadData.getItem2(), 1);
 				c.getActionSender().sendMessage(
 						"You add a string to the bow.");
 				c.getItemAssistant().addItem(loadData.getProduct(), 1);

2006Redone Server/src/redone/game/content/skills/smithing/SilverCrafting.java

@@ -131,7 +131,7 @@ public class SilverCrafting {
 											.getItemName(
 													silverCraft.getResult())
 											.toLowerCase().toLowerCase() + ".");
-					player.getItemAssistant().deleteItem2(SILVER_BAR, 1);
+					player.getItemAssistant().deleteItem(SILVER_BAR, 1);
 					player.getItemAssistant().addItem(silverCraft.getResult(),
 							1);
 					player.getPlayerAssistant().addSkillXP(

2006Redone Server/src/redone/game/content/skills/smithing/Smelting.java

@@ -129,7 +129,7 @@ public class Smelting extends SkillHandler {
 							c.getItemAssistant().deleteItem(c.playerSkillProp[13][4], 1);
 						}
 						if (c.playerSkillProp[13][5] > 0) {// if coal amount is > 0
-							c.getItemAssistant().deleteItem2(c.playerSkillProp[13][4], c.playerSkillProp[13][5]);
+							c.getItemAssistant().deleteItem(c.playerSkillProp[13][4], c.playerSkillProp[13][5]);
 						}
 
 						if (c.playerSkillProp[13][3] == IRON && c.playerSkillProp[13][4] == -1 && Misc.random(100) >= 50) {

2006Redone Server/src/redone/game/content/skills/smithing/Smithing.java

@@ -869,7 +869,7 @@ public class Smithing {
 			}
 			while (makeTimes > 0 && c.isSmithing == true) {
 				if (c.getItemAssistant().playerHasItem(removeItem, removeItem2)) {
-					c.getItemAssistant().deleteItem2(removeItem, removeItem2);
+					c.getItemAssistant().deleteItem(removeItem, removeItem2);
 					if (ItemAssistant.getItemName(addItem).contains("bolt")) {
 						c.getItemAssistant().addItem(addItem, 10);
 					} else if (ItemAssistant.getItemName(addItem).contains("tip") && !ItemAssistant.getItemName(addItem).contains("dart tip")) {

2006Redone Server/src/redone/game/content/traveling/Sailing.java

@@ -41,7 +41,7 @@ public class Sailing {
 			player.nextChat = 0;
 			return false;
 		}
-		player.getItemAssistant().deleteItem2(995, 1000);
+		player.getItemAssistant().deleteItem(995, 1000);
 		player.getActionSender().sendMessage("Your free to go and pay the 1000 coins.");
 		return true;
 	}
@@ -52,7 +52,7 @@ public class Sailing {
 			player.nextChat = 0;
 			return false;
 		}
-		player.getItemAssistant().deleteItem2(995, 30);
+		player.getItemAssistant().deleteItem(995, 30);
 		player.getActionSender().sendMessage("Your free to go and pay the 30 coins.");
 		return true;
 	}

2006Redone Server/src/redone/game/dialogues/DialogueHandler.java

@@ -9,7 +9,6 @@ import redone.game.content.skills.SkillHandler;
 import redone.game.content.skills.slayer.Slayer;
 import redone.game.content.traveling.Sailing;
 import redone.game.globalworldobjects.PassDoor;
-import redone.game.items.ItemAssistant;
 import redone.game.npcs.NpcHandler;
 import redone.game.objects.impl.SpecialObjects;
 import redone.game.players.Client;
@@ -130,7 +129,7 @@ public class DialogueHandler {
 
 			case 12:
 				if (player.getItemAssistant().playerHasItem(995, 5)) {
-					player.getItemAssistant().deleteItem2(995, 5);
+					player.getItemAssistant().deleteItem(995, 5);
 					sendPlayerChat1("Here's 5 coins you tramp.");
 					player.nextChat = 0;
 				} else {
@@ -181,7 +180,7 @@ public class DialogueHandler {
 			case 20:
 				if (player.getItemAssistant().playerHasItem(995, 2)) {
 					sendPlayerChat1("Yes I would love a beer.");
-					player.getItemAssistant().deleteItem2(995, 2);
+					player.getItemAssistant().deleteItem(995, 2);
 					player.getItemAssistant().addOrDropItem(1917, 1);
 					player.nextChat = 0;
 				} else {
@@ -223,7 +222,7 @@ public class DialogueHandler {
 			case 25:
 				sendPlayerChat1("Yes please.");
 				player.getPlayerAssistant().startTeleport(3308, 3108, 0, "modern");
-				player.getItemAssistant().deleteItem2(995, 200);
+				player.getItemAssistant().deleteItem(995, 200);
 				player.nextChat = 0;
 				break;
 
@@ -268,7 +267,7 @@ public class DialogueHandler {
 				break;
 			case 32:
 				sendNpcChat1("Enjoy!", player.talkingNpc, "Rug Merchant");
-				player.getItemAssistant().deleteItem2(995, 200);
+				player.getItemAssistant().deleteItem(995, 200);
 				player.nextChat = 0;
 				break;
 			case 33:
@@ -516,9 +515,9 @@ public class DialogueHandler {
 				}
 				break;
 			case 86:
-				player.getItemAssistant().deleteItem2(434, 6);
+				player.getItemAssistant().deleteItem(434, 6);
-				player.getItemAssistant().deleteItem2(436, 4);
+				player.getItemAssistant().deleteItem(436, 4);
-				player.getItemAssistant().deleteItem2(440, 2);
+				player.getItemAssistant().deleteItem(440, 2);
 				player.doricQuest = 2;
 				sendNpcChat2("You brought me everything i need.", "Thank You!",
 						player.talkingNpc, "Doric");
@@ -709,10 +708,10 @@ public class DialogueHandler {
 						&& player.getItemAssistant().playerHasItem(1472, 1)
 						&& player.getItemAssistant().playerHasItem(1474, 1)
 						&& player.getItemAssistant().playerHasItem(1476, 1)) {
-					player.getItemAssistant().deleteItem2(1470, 1);
+					player.getItemAssistant().deleteItem(1470, 1);
-					player.getItemAssistant().deleteItem2(1472, 1);
+					player.getItemAssistant().deleteItem(1472, 1);
-					player.getItemAssistant().deleteItem2(1474, 1);
+					player.getItemAssistant().deleteItem(1474, 1);
-					player.getItemAssistant().deleteItem2(1476, 1);
+					player.getItemAssistant().deleteItem(1476, 1);
 					player.impsC = 2;
 					player.nextChat = 162;
 				} else {
@@ -1564,7 +1563,7 @@ public class DialogueHandler {
 			case 313:
 				if (player.getItemAssistant().playerHasItem(995, 100)) {
 					sendStatement("You give the lad 100 coins.");
-					player.getItemAssistant().deleteItem2(995, 100);
+					player.getItemAssistant().deleteItem(995, 100);
 					player.nextChat = 314;
 					player.gertCat = 2;
 				} else {
@@ -2084,7 +2083,7 @@ public class DialogueHandler {
 				break;
 			case 417:
 				sendNpcChat1("Pass it here, pass it!", player.talkingNpc, "Romeo");
-				player.getItemAssistant().deleteItem2(755, 1);
+				player.getItemAssistant().deleteItem(755, 1);
 				player.nextChat = 418;
 				break;
 			case 418:
@@ -2240,9 +2239,9 @@ public class DialogueHandler {
 				break;
 			case 448:
 				sendNpcChat1("I'll take that", player.talkingNpc, "Winelda");
-				player.getItemAssistant().deleteItem2(300, 1);
+				player.getItemAssistant().deleteItem(300, 1);
-				player.getItemAssistant().deleteItem2(227, 1);
+				player.getItemAssistant().deleteItem(227, 1);
-				player.getItemAssistant().deleteItem2(526, 1);
+				player.getItemAssistant().deleteItem(526, 1);
 				player.nextChat = 449;
 				break;
 			case 449:
@@ -2288,7 +2287,7 @@ public class DialogueHandler {
 				break;
 			case 459:
 				sendStatement("Juliet drinks the potion.");
-				player.getItemAssistant().deleteItem2(4836, 1);
+				player.getItemAssistant().deleteItem(4836, 1);
 				player.nextChat = 460;
 				break;
 			case 460:
@@ -2560,7 +2559,7 @@ public class DialogueHandler {
 			case 509:
 				if (player.getItemAssistant().playerHasItem(1917, 1)) {
 					sendPlayerChat1("Okay, here you go.");
-					player.getItemAssistant().deleteItem2(1917, 1);
+					player.getItemAssistant().deleteItem(1917, 1);
 					player.nextChat = 510;
 				} else {
 					sendPlayerChat1("Okay, let me get one.");
@@ -2809,9 +2808,9 @@ public class DialogueHandler {
 							"Cauldron.",
 							"Hetty closes her eyes and begins to chant.",
 							"The caludron bubbles mysteriously.");
-					player.getItemAssistant().deleteItem2(221, 1);
+					player.getItemAssistant().deleteItem(221, 1);
-					player.getItemAssistant().deleteItem2(300, 1);
+					player.getItemAssistant().deleteItem(300, 1);
-					player.getItemAssistant().deleteItem2(2146, 1);
+					player.getItemAssistant().deleteItem(2146, 1);
 					player.nextChat = 552;
 				} else {
 					sendPlayerChat1("I don't have them anymore.");
@@ -2951,7 +2950,7 @@ public class DialogueHandler {
 			case 575:
 				if (player.getItemAssistant().playerHasItem(431, 1)) {
 					sendStatement("Frank happily takes the rum... and hands you a key");
-					player.getItemAssistant().deleteItem2(431, 1);
+					player.getItemAssistant().deleteItem(431, 1);
 					player.getItemAssistant().addOrDropItem(432, 1);
 					player.nextChat = 576;
 				} else {
@@ -3002,7 +3001,7 @@ public class DialogueHandler {
 					return;
 				} else {
 					Sailing.startTravel(player, 5);
-					player.getItemAssistant().deleteItem2(995, 30);
+					player.getItemAssistant().deleteItem(995, 30);
 					player.nextChat = 0;
 				}
 				break;
@@ -3035,13 +3034,13 @@ public class DialogueHandler {
 					return;
 				} else {
 					Sailing.startTravel(player, 6);
-					player.getItemAssistant().deleteItem2(995, 30);
+					player.getItemAssistant().deleteItem(995, 30);
 					player.nextChat = 0;
 				}
 				break;
 
 			case 589:
-				player.getItemAssistant().deleteItem2(995, 30);
+				player.getItemAssistant().deleteItem(995, 30);
 				player.nextChat = 0;
 				break;
 
@@ -3299,7 +3298,7 @@ public class DialogueHandler {
 			case 646:
 				if (player.getItemAssistant().playerHasItem(2325, 1)) {
 					sendStatement2("You hand over the pie. Thurgo eats the pie. Thurgo pats his", "stomach.");
-					player.getItemAssistant().deleteItem2(2325, 1);
+					player.getItemAssistant().deleteItem(2325, 1);
 					player.nextChat = 647;
 				} else {
 					sendPlayerChat1("I don't have pie anymore.");
@@ -3370,7 +3369,7 @@ public class DialogueHandler {
 				break;
 			case 661:
 				sendStatement("You give the portrait to Thurgo. Thurgo studies the portrait.");
-				player.getItemAssistant().deleteItem2(666, 1);
+				player.getItemAssistant().deleteItem(666, 1);
 				player.nextChat = 662;
 				break;
 			case 662:
@@ -3420,9 +3419,9 @@ public class DialogueHandler {
 			case 671:
 				if (player.knightS == 7 || player.knightS == 8) {
 					sendStatement2("You give the blurite ore and two bars to Thurgo. Thurgo starts", "to make the sword. Thurgo hands you a sword.");
-					player.getItemAssistant().deleteItem2(2351, 1);
+					player.getItemAssistant().deleteItem(2351, 1);
-					player.getItemAssistant().deleteItem2(2351, 1);
+					player.getItemAssistant().deleteItem(2351, 1);
-					player.getItemAssistant().deleteItem2(668, 1);
+					player.getItemAssistant().deleteItem(668, 1);
 					player.getItemAssistant().addItem(667, 1);
 					player.knightS = 8;
 					player.nextChat = 672;
@@ -3501,7 +3500,7 @@ public class DialogueHandler {
 				break;
 			case 684:
 				sendStatement("You give the sword to the squire.");
-				player.getItemAssistant().deleteItem2(667, 1);
+				player.getItemAssistant().deleteItem(667, 1);
 				player.knightS = 8;
 				player.nextChat = 685;
 				break;
@@ -4193,7 +4192,7 @@ public class DialogueHandler {
 			case 1054:
 				sendStatement("You give Saniboch 875 coins.");
 				player.nextChat = 1055;
-				player.getItemAssistant().deleteItem2(995, 875);
+				player.getItemAssistant().deleteItem(995, 875);
 				player.hasPaidBrim = true;
 				break;
 			case 1055:
@@ -4390,7 +4389,7 @@ public class DialogueHandler {
 			case 1314:// red 1763, yellow 1765, blue 1767
 				if (player.getItemAssistant().playerHasItem(1951, 3)
 						&& player.getItemAssistant().playerHasItem(995, 5)) {
-					player.getItemAssistant().deleteItem2(1951, 3);
+					player.getItemAssistant().deleteItem(1951, 3);
 					player.getItemAssistant().addOrDropItem(1763, 1);
 					sendPlayerChat1("Red Dye Please.");
 					player.nextChat = 0;
@@ -4405,7 +4404,7 @@ public class DialogueHandler {
 			case 1315:// red 1763, yellow 1765, blue 1767
 				if (player.getItemAssistant().playerHasItem(1957, 2)
 						&& player.getItemAssistant().playerHasItem(995, 5)) {
-					player.getItemAssistant().deleteItem2(1957, 2);
+					player.getItemAssistant().deleteItem(1957, 2);
 					player.getItemAssistant().addOrDropItem(1765, 1);
 					sendPlayerChat1("Yellow Dye Please.");
 					player.nextChat = 0;
@@ -4420,7 +4419,7 @@ public class DialogueHandler {
 			case 1316:// red 1763, yellow 1765, blue 1767
 				if (player.getItemAssistant().playerHasItem(1793, 2)
 						&& player.getItemAssistant().playerHasItem(995, 5)) {
-					player.getItemAssistant().deleteItem2(1793, 2);
+					player.getItemAssistant().deleteItem(1793, 2);
 					player.getItemAssistant().addOrDropItem(1767, 1);
 					sendPlayerChat1("Blue Dye Please.");
 					player.nextChat = 0;
@@ -4566,7 +4565,7 @@ public class DialogueHandler {
 			case 1335:
 				if (player.getItemAssistant().playerHasItem(6183, 1)) {
 					sendPlayerChat1("A frog mask please!");
-					player.getItemAssistant().deleteItem2(6183, 1);
+					player.getItemAssistant().deleteItem(6183, 1);
 					player.getItemAssistant().addOrDropItem(6188, 1);
 					player.nextChat = 0;
 				} else {
@@ -4581,14 +4580,14 @@ public class DialogueHandler {
 				if (player.getItemAssistant().playerHasItem(6183, 1)
 						&& player.playerAppearance[0] == 0) {
 					sendPlayerChat1("A frog prince outfit, please!");
-					player.getItemAssistant().deleteItem2(6183, 1);
+					player.getItemAssistant().deleteItem(6183, 1);
 					player.getItemAssistant().addOrDropItem(6184, 1);
 					player.getItemAssistant().addOrDropItem(6185, 1);
 					player.nextChat = 0;
 				} else if (player.getItemAssistant().playerHasItem(6183, 1)
 						&& player.playerAppearance[0] == 1) {
 					sendPlayerChat1("A frog princess outfit, please!");
-					player.getItemAssistant().deleteItem2(6183, 1);
+					player.getItemAssistant().deleteItem(6183, 1);
 					player.getItemAssistant().addOrDropItem(6186, 1);
 					player.getItemAssistant().addOrDropItem(6187, 1);
 					player.nextChat = 0;
@@ -4635,7 +4634,7 @@ public class DialogueHandler {
 
 			case 1343:
 				if (player.getItemAssistant().playerHasItem(995, 15)) {
-					player.getItemAssistant().deleteItem2(995, 15);
+					player.getItemAssistant().deleteItem(995, 15);
 					player.getItemAssistant().addOrDropItem(954, 1);
 					sendPlayerChat1("I will give you 15 coins for 1 rope.");
 					player.nextChat = 0;
@@ -4649,7 +4648,7 @@ public class DialogueHandler {
 
 			case 1344:
 				if (player.getItemAssistant().playerHasItem(1759, 4)) {
-					player.getItemAssistant().deleteItem2(1759, 4);
+					player.getItemAssistant().deleteItem(1759, 4);
 					player.getItemAssistant().addOrDropItem(954, 1);
 					sendPlayerChat1("I will give you 4 balls of wool for 1 rope.");
 					player.nextChat = 0;
@@ -4681,7 +4680,7 @@ public class DialogueHandler {
 
 			case 1348:
 				if (player.getItemAssistant().playerHasItem(995, 12)) {
-					player.getItemAssistant().deleteItem2(995, 12);
+					player.getItemAssistant().deleteItem(995, 12);
 					player.getItemAssistant().addOrDropItem(3105, 1);
 					sendPlayerChat1("Yes please.");
 					player.nextChat = 0;
@@ -4735,14 +4734,14 @@ public class DialogueHandler {
 			case 1352:
 				if (player.getItemAssistant().playerHasItem(995, 50)
 						&& player.absY > 3485 && player.absY < 3489) {
-					player.getItemAssistant().deleteItem2(995, 50);
+					player.getItemAssistant().deleteItem(995, 50);
 					sendPlayerChat1("Yes please.");
 					player.getPlayerAssistant().startTeleport(2358, 3640, 0,
 							"modern");
 					player.hasPaid = true;
 					player.nextChat = 0;
 				} else if (player.getItemAssistant().playerHasItem(995, 50)) {
-					player.getItemAssistant().deleteItem2(995, 50);
+					player.getItemAssistant().deleteItem(995, 50);
 					sendPlayerChat1("Yes please.");
 					player.getPlayerAssistant().startTeleport(2367, 3488, 0,
 							"modern");
@@ -4887,7 +4886,7 @@ public class DialogueHandler {
 					sendPlayerChat1("Yes please.");
 					player.getPlayerAssistant().showInterface(3559);
 					player.canChangeAppearance = true;
-					player.getItemAssistant().deleteItem2(995, 3000);
+					player.getItemAssistant().deleteItem(995, 3000);
 					player.nextChat = 0;
 				} else {
 					sendNpcChat1("You don't have enough gold to do that.",
@@ -4945,7 +4944,7 @@ public class DialogueHandler {
 			case 1380:
 				if (player.getItemAssistant().playerHasItem(995, 1000)) {
 					sendPlayerChat1("Yes please.");
-					player.getItemAssistant().deleteItem2(995, 1000);
+					player.getItemAssistant().deleteItem(995, 1000);
 					player.nextChat = 0;
 				} else {
 					sendNpcChat1("You don't have enough coins to buy a candle.",
@@ -6157,7 +6156,7 @@ public class DialogueHandler {
 			case 3123:
 				if (player.getItemAssistant().playerHasItem(995, 3)) {
 					sendPlayerChat1("Asgarnian Ale please.");
-					player.getItemAssistant().deleteItem2(995, 3);
+					player.getItemAssistant().deleteItem(995, 3);
 					player.getItemAssistant().addOrDropItem(1905, 1);
 					player.nextChat = 0;
 				} else {
@@ -6169,14 +6168,14 @@ public class DialogueHandler {
 
 			case 3124:
 				sendPlayerChat1("Wizard's Mind Bomb please.");
-				player.getItemAssistant().deleteItem2(995, 3);
+				player.getItemAssistant().deleteItem(995, 3);
 				player.getItemAssistant().addOrDropItem(1907, 1);
 				player.nextChat = 0;
 				break;
 
 			case 3125:
 				sendPlayerChat1("Dwarven Stout please.");
-				player.getItemAssistant().deleteItem2(995, 3);
+				player.getItemAssistant().deleteItem(995, 3);
 				player.getItemAssistant().addOrDropItem(1913, 1);
 				player.nextChat = 0;
 				break;
@@ -6362,7 +6361,7 @@ public class DialogueHandler {
 			case 3156:
 				if (player.getItemAssistant().playerHasItem(995, 16)) {
 					sendPlayerChat1("Meat Pie please.");
-					player.getItemAssistant().deleteItem2(995, 16);
+					player.getItemAssistant().deleteItem(995, 16);
 					player.getItemAssistant().addOrDropItem(2327, 1);
 					player.nextChat = 0;
 				} else {
@@ -6375,7 +6374,7 @@ public class DialogueHandler {
 			case 3157:
 				if (player.getItemAssistant().playerHasItem(995, 20)) {
 					sendPlayerChat1("Stew please.");
-					player.getItemAssistant().deleteItem2(995, 20);
+					player.getItemAssistant().deleteItem(995, 20);
 					player.getItemAssistant().addOrDropItem(2003, 1);
 					player.nextChat = 0;
 				} else {
@@ -6429,7 +6428,7 @@ public class DialogueHandler {
 							"That sounds like a fair offer, here's one woaf leaf.",
 							player.talkingNpc, "Wyson the Gardener");
 					player.getItemAssistant().addOrDropItem(1793, 1);
-					player.getItemAssistant().deleteItem2(995, 15);
+					player.getItemAssistant().deleteItem(995, 15);
 					player.nextChat = 0;
 				} else {
 					sendNpcChat1("You don't have enough coins to buy a woad leaf.",
@@ -6443,7 +6442,7 @@ public class DialogueHandler {
 							"That offer sounds generous, I will give you two woaf leaves!",
 							player.talkingNpc, "Wyson the Gardener");
 					player.getItemAssistant().addOrDropItem(1793, 2);
-					player.getItemAssistant().deleteItem2(995, 20);
+					player.getItemAssistant().deleteItem(995, 20);
 					player.nextChat = 0;
 				} else {
 					sendNpcChat1("You don't have enough coins to buy a woad leaf.",
@@ -6475,7 +6474,7 @@ public class DialogueHandler {
 			case 3171:
 				if (player.getItemAssistant().playerHasItem(995, 5)) {
 					sendNpcChat1("Sure thing.", player.talkingNpc, "Roavar");
-					player.getItemAssistant().deleteItem2(995, 5);
+					player.getItemAssistant().deleteItem(995, 5);
 					player.getItemAssistant().addOrDropItem(2955, 1);
 					player.nextChat = 0;
 				} else {
@@ -6515,7 +6514,7 @@ public class DialogueHandler {
 
 			case 3177:
 				if (player.getItemAssistant().playerHasItem(995, 200)) {
-					player.getItemAssistant().deleteItem2(995, 200);
+					player.getItemAssistant().deleteItem(995, 200);
 					player.getPlayerAssistant().startTeleport(2834, 2953, 0,
 							"modern");
 					player.nextChat = 0;
@@ -6551,7 +6550,7 @@ public class DialogueHandler {
 
 			case 3182:
 				if (player.getItemAssistant().playerHasItem(995, 200)) {
-					player.getItemAssistant().deleteItem2(995, 200);
+					player.getItemAssistant().deleteItem(995, 200);
 					player.getPlayerAssistant().startTeleport(2779, 3212, 0, "modern");
 					player.nextChat = 0;
 				} else {
@@ -6580,7 +6579,7 @@ public class DialogueHandler {
 						&& !player.getItemAssistant().playerHasItem(775)
 						&& player.playerEquipment[player.playerHands] != 775) {
 					sendPlayerChat1("Yes please.");
-					player.getItemAssistant().deleteItem2(995, 25000);
+					player.getItemAssistant().deleteItem(995, 25000);
 					player.getPlayerAssistant().removeGloves();
 					player.getItemAssistant().addOrDropItem(775, 1);
 					player.nextChat = 0;
@@ -6631,7 +6630,7 @@ public class DialogueHandler {
 						&& !player.getItemAssistant().playerHasItem(776)
 						&& player.playerEquipment[player.playerHands] != 776) {
 					sendPlayerChat1("Yes please.");
-					player.getItemAssistant().deleteItem2(995, 25000);
+					player.getItemAssistant().deleteItem(995, 25000);
 					player.getPlayerAssistant().removeGloves();
 					player.getItemAssistant().addOrDropItem(776, 1);
 					player.nextChat = 0;
@@ -6687,7 +6686,7 @@ public class DialogueHandler {
 				break;
 
 			case 3198:
-				player.getItemAssistant().deleteItem2(7418, MOLE_SKIN);
+				player.getItemAssistant().deleteItem(7418, MOLE_SKIN);
 				player.getItemAssistant().addOrDropItem(7413, MOLE_SKIN);
 				sendNpcChat1("Here you go", player.talkingNpc, NpcHandler.getNpcListName(player.talkingNpc));
 				player.nextChat = 0;
@@ -6704,7 +6703,7 @@ public class DialogueHandler {
 				break;
 
 			case 3200:
-				player.getItemAssistant().deleteItem2(7416, MOLE_CLAW);
+				player.getItemAssistant().deleteItem(7416, MOLE_CLAW);
 				player.getItemAssistant().addOrDropItem(7413, MOLE_CLAW);
 				sendNpcChat1("Here you go", player.talkingNpc, NpcHandler.getNpcListName(player.talkingNpc));
 				player.nextChat = 0;

2006Redone Server/src/redone/game/items/ItemAssistant.java

@@ -9,10 +9,6 @@ import redone.game.players.Client;
 import redone.game.players.PlayerHandler;
 import redone.util.Misc;
 
-import java.io.BufferedWriter;
-import java.io.FileWriter;
-import java.io.IOException;
-
 public class ItemAssistant {
 
 	private final Client c;
@@ -38,14 +34,14 @@ public class ItemAssistant {
 			int chance = element[2];
 			if (Misc.random(chance) == 0 && System.currentTimeMillis() - clickTimer > 1800) {
 				addItem(item, amount);
-				deleteItem2(itemId, 1);
+				deleteItem(itemId, 1);
 				clickTimer = System.currentTimeMillis();
 				c.getActionSender().sendMessage(
 						"You find " + amount + " " + getItemName(item) + ".");
 			} else {
 				if (System.currentTimeMillis() - clickTimer > 1800) {
 					addItem(995, 100);
-					deleteItem2(itemId, 1);
+					deleteItem(itemId, 1);
 					clickTimer = System.currentTimeMillis();
 					c.getActionSender().sendMessage("You find 100 coins.");
 				}
@@ -1752,7 +1748,7 @@ public class ItemAssistant {
 				if (addItem(c.playerEquipment[slot], c.playerEquipmentN[slot])) {
 					if (c.playerEquipment[slot] == CastleWars.SARA_BANNER || c.playerEquipment[slot] == CastleWars.ZAMMY_BANNER) {
 						CastleWars.dropFlag(c, c.playerEquipment[slot]);
-						deleteItem2(c.playerEquipment[slot], 1);
+						deleteItem(c.playerEquipment[slot], 1);
 					}
 					c.playerEquipment[slot] = -1;
 					c.playerEquipmentN[slot] = 0;
@@ -2484,23 +2480,6 @@ public class ItemAssistant {
 		}
 	}
 
-	public void deleteItem2(int id, int amount) {
-		int am = amount;
-		for (int i = 0; i < c.playerItems.length; i++) {
-			if (c.playerItems[i] == id + 1) {
-				if (c.playerItemsN[i] > amount) {
-					c.playerItemsN[i] -= amount;
-					break;
-				} else {
-					c.playerItems[i] = 0;
-					c.playerItemsN[i] = 0;
-				}
-			}
-		}
-		resetItems(3214);
-		Weight.calcWeight(c, id, "deleteItem");
-	}
-
 	/**
 	 * Delete Arrows
 	 **/

2006Redone Server/src/redone/game/items/UseItem.java

@@ -81,7 +81,7 @@ public class UseItem {
 
 		case 364:
 			if (itemId == 1919) {
-				c.getItemAssistant().deleteItem2(1919, 1);
+				c.getItemAssistant().deleteItem(1919, 1);
 				c.getItemAssistant().addItem(1917, 1);
 				c.getActionSender().sendMessage(
 						"You refill your beer glass.");
@@ -168,7 +168,7 @@ public class UseItem {
 		}
 		if (useWith == 7051 && itemUsed == 590 || itemUsed == 590
 				&& useWith == 7051) {
-			c.getItemAssistant().deleteItem2(7051, 1);
+			c.getItemAssistant().deleteItem(7051, 1);
 			c.getItemAssistant().addItem(7053, 1);
 		}
 		int firemakingItems[] = {590, 7329, 7330, 7331};
@@ -183,75 +183,75 @@ public class UseItem {
 			LeatherMaking.craftLeatherDialogue(c, itemUsed, useWith);
 		}
 		if (itemUsed == 1573 && useWith == 327 || itemUsed == 327 && useWith == 1573) {
-			c.getItemAssistant().deleteItem2(1573, 1);
+			c.getItemAssistant().deleteItem(1573, 1);
-			c.getItemAssistant().deleteItem2(327, 1);
+			c.getItemAssistant().deleteItem(327, 1);
 			c.getItemAssistant().addItem(1552, 1);
 		}
 		if (itemUsed == 38 && useWith == 590 || useWith == 38
 				&& itemUsed == 590) {//
 			c.getItemAssistant().addItem(32, 1);
-			c.getItemAssistant().deleteItem2(38, 1);
+			c.getItemAssistant().deleteItem(38, 1);
 		}
 		if (itemUsed == 36 && useWith == 590 || useWith == 36
 				&& itemUsed == 590) {
 			c.getItemAssistant().addItem(33, 1);
-			c.getItemAssistant().deleteItem2(36, 1);
+			c.getItemAssistant().deleteItem(36, 1);
 		}
 		if (itemUsed == 596 && useWith == 590 || useWith == 596
 				&& itemUsed == 590) {
 			c.getItemAssistant().addItem(594, 1);
-			c.getItemAssistant().deleteItem2(596, 1);
+			c.getItemAssistant().deleteItem(596, 1);
 		}
 		if (itemUsed == 4537 && useWith == 590 || useWith == 4537
 				&& itemUsed == 590) {
 			c.getItemAssistant().addItem(4539, 1);
-			c.getItemAssistant().deleteItem2(4537, 1);
+			c.getItemAssistant().deleteItem(4537, 1);
 		}
 		if (itemUsed == 4548 && useWith == 590 || useWith == 4548
 				&& itemUsed == 590) {
 			c.getItemAssistant().addItem(4550, 1);
-			c.getItemAssistant().deleteItem2(4548, 1);
+			c.getItemAssistant().deleteItem(4548, 1);
 		}
 		if (itemUsed == 1095 && useWith == 2370 || itemUsed == 2370
 				&& useWith == 1095 && c.playerLevel[c.playerCrafting] > 43) {// chaps
-			c.getItemAssistant().deleteItem2(2370, 1);
+			c.getItemAssistant().deleteItem(2370, 1);
-			c.getItemAssistant().deleteItem2(1095, 1);
+			c.getItemAssistant().deleteItem(1095, 1);
 			c.getItemAssistant().addItem(1097, 1);
 			c.getPlayerAssistant().addSkillXP(42, c.playerCrafting);
 		} else if (itemUsed == 1095 && useWith == 2370 || itemUsed == 2370 && useWith == 1095 && c.playerLevel[c.playerCrafting] < 44) {
 			c.getActionSender().sendMessage("You need 44 crafting to make this.");
 		}
 		if (itemUsed == 946 && useWith == 1963 || itemUsed == 1963  && useWith == 946) {
-			c.getItemAssistant().deleteItem2(1963, 1);
+			c.getItemAssistant().deleteItem(1963, 1);
 			c.getItemAssistant().addItem(3162, 1);
 			c.getActionSender().sendMessage("You slice your banana.");
 		}
 		if (itemUsed == 946 && useWith == 1973 || itemUsed == 1973 && useWith == 946) {
-			c.getItemAssistant().deleteItem2(1973, 1);
+			c.getItemAssistant().deleteItem(1973, 1);
 			c.getItemAssistant().addItem(1975, 1);
 			c.getActionSender().sendMessage("You slice your chocolate bar.");
 		}
 		if (itemUsed == 1129 && useWith == 2370 || itemUsed == 2370 && useWith == 1129 && c.playerLevel[c.playerCrafting] > 40) {// body
-			c.getItemAssistant().deleteItem2(2370, 1);
+			c.getItemAssistant().deleteItem(2370, 1);
-			c.getItemAssistant().deleteItem2(1129, 1);
+			c.getItemAssistant().deleteItem(1129, 1);
 			c.getItemAssistant().addItem(1133, 1);
 			c.getPlayerAssistant().addSkillXP(40, c.playerCrafting);
 		} else if (itemUsed == 1129 && useWith == 2370 || itemUsed == 2370 && useWith == 1129 && c.playerLevel[c.playerCrafting] < 41) {
 			c.getActionSender().sendMessage("You need 41 crafting to make this.");
 		}
 		if (itemUsed == 4593 && useWith == 4591 || useWith == 4591 && itemUsed == 4593) {
-			c.getItemAssistant().deleteItem2(4591, 1);
+			c.getItemAssistant().deleteItem(4591, 1);
-			c.getItemAssistant().deleteItem2(4593, 1);
+			c.getItemAssistant().deleteItem(4593, 1);
 			c.getItemAssistant().addItem(4611, 1);
 		}
 		if (itemUsed == 985 && useWith == 987 || itemUsed == 987 && useWith == 985) {
-			c.getItemAssistant().deleteItem2(985, 1);
+			c.getItemAssistant().deleteItem(985, 1);
-			c.getItemAssistant().deleteItem2(987, 1);
+			c.getItemAssistant().deleteItem(987, 1);
 			c.getItemAssistant().addItem(989, 1);
 		}
 		if (itemUsed == 2313 && useWith == 1953 || itemUsed == 1953 && useWith == 2313) {
-			c.getItemAssistant().deleteItem2(2313, 1);
+			c.getItemAssistant().deleteItem(2313, 1);
-			c.getItemAssistant().deleteItem2(1953, 1);
+			c.getItemAssistant().deleteItem(1953, 1);
 			c.getItemAssistant().addItem(2315, 1);
 		}
 
@@ -344,7 +344,7 @@ public class UseItem {
 			if (c.playerLevel[c.playerCooking] >= 35) {
 				c.getItemAssistant().addItem(1993, 1);
 				c.getItemAssistant().deleteItem(1937, 1);
-				c.getItemAssistant().deleteItem2(1987, 1);
+				c.getItemAssistant().deleteItem(1987, 1);
 				c.getPlayerAssistant().addSkillXP(200, c.playerCooking);
 			} else {
 				c.getActionSender().sendMessage(

2006Redone Server/src/redone/game/items/impl/CapeDye.java

@@ -34,8 +34,8 @@ public class CapeDye {
 	
 	private static void cleanUp(Client c, int itemUsed, int useWith) {
 		c.getPlayerAssistant().addSkillXP(2.5, c.playerCrafting);
-		c.getItemAssistant().deleteItem2(itemUsed, 1);
+		c.getItemAssistant().deleteItem(itemUsed, 1);
-		c.getItemAssistant().deleteItem2(useWith, 1);
+		c.getItemAssistant().deleteItem(useWith, 1);
 	}
 	
 	/**

2006Redone Server/src/redone/game/items/impl/ExperienceLamp.java

@@ -108,7 +108,7 @@ public class ExperienceLamp {
 				int xp = c.getPlayerAssistant()
 						.getLevelForXP(c.playerXP[skill]) * 10;
 				c.getPlayerAssistant().addNormalExperienceRate(xp, skill);
-				c.getItemAssistant().deleteItem2(LAMP, 1);
+				c.getItemAssistant().deleteItem(LAMP, 1);
 				c.getActionSender().sendMessage(
 						"@blu@Your wish has been granted!");
 				c.getActionSender().sendMessage(
@@ -118,7 +118,7 @@ public class ExperienceLamp {
 			} else if (c.getItemAssistant().playerHasItem(LAMP_2, 1)
 					&& skill > -1) {// vote
 									// reward
-				c.getItemAssistant().deleteItem2(LAMP_2, 1);
+				c.getItemAssistant().deleteItem(LAMP_2, 1);
 				c.getActionSender().sendMessage(
 						"@blu@Your wish has been granted!");
 				addExp(c);

2006Redone Server/src/redone/game/items/impl/Flowers.java

@@ -143,7 +143,7 @@ public class Flowers {
 	 * @param c
 	 */
 	private static void deleteSeeds(Client c) {
-		c.getItemAssistant().deleteItem2(299, 1);
+		c.getItemAssistant().deleteItem(299, 1);
 	}
 
 	private void updateConstants(int objectType, Client c) {

2006Redone Server/src/redone/game/npcs/NpcActions.java

@@ -485,13 +485,13 @@ public class NpcActions {
 		case 759:
 			if (c.getItemAssistant().playerHasItem(1927, 1) && c.gertCat == 2) {
 				c.getDialogueHandler().sendDialogues(319, npcType);
-				c.getItemAssistant().deleteItem2(1927, 1);
+				c.getItemAssistant().deleteItem(1927, 1);
 				c.getItemAssistant().addItem(1925, 1);
 				c.gertCat = 3;
 			} else if (c.getItemAssistant().playerHasItem(1552, 1)
 					&& c.gertCat == 3) {
 				c.getDialogueHandler().sendDialogues(323, npcType);
-				c.getItemAssistant().deleteItem2(1552, 1);
+				c.getItemAssistant().deleteItem(1552, 1);
 				c.gertCat = 4;
 			} else if (c.gertCat == 4) {
 				c.getDialogueHandler().sendStatement("Hiss!");
@@ -499,7 +499,7 @@ public class NpcActions {
 				c.gertCat = 5;
 			} else if (c.getItemAssistant().playerHasItem(1554, 1)
 					&& c.gertCat == 6) {
-				c.getItemAssistant().deleteItem2(1554, 1);
+				c.getItemAssistant().deleteItem(1554, 1);
 				c.getDialogueHandler().sendDialogues(326, npcType);
 				c.gertCat = 6;
 			} else if (c.gertCat == 2) {
@@ -797,14 +797,14 @@ public class NpcActions {
 		if (c.absX > 2619 && c.absX < 2622 && c.absY > 3680 && c.absY < 3689 && c.getItemAssistant().playerHasItem(995, 1000)) {
 			//Sailing.startTravel(c, 18);
 			c.getPlayerAssistant().startTeleport(2551, 3759, 0, "modern");
-			c.getItemAssistant().deleteItem2(995, 1000);
+			c.getItemAssistant().deleteItem(995, 1000);
 			c.getDialogueHandler().sendStatement("You arrive safely.");
 			c.nextChat = 0;
 		} else {
 			 if (c.getItemAssistant().playerHasItem(995, 1000)) {
 			//Sailing.startTravel(c, 17);	
 			c.getPlayerAssistant().startTeleport(2620, 3686, 0, "modern");
-			c.getItemAssistant().deleteItem2(995, 1000);
+			c.getItemAssistant().deleteItem(995, 1000);
 			c.getDialogueHandler().sendStatement("You arrive safely.");
 			c.nextChat = 0;
 			 }
@@ -856,7 +856,7 @@ public class NpcActions {
 					c.turnPlayerTo(c.objectX, c.objectY);
 					c.startAnimation(2292);
 					c.getItemAssistant().addItem(1927, 1);
-					c.getItemAssistant().deleteItem2(1925, 1);
+					c.getItemAssistant().deleteItem(1925, 1);
 					c.buryDelay = System.currentTimeMillis();
 				} else {
 					c.getActionSender().sendMessage(
@@ -1027,14 +1027,14 @@ public class NpcActions {
 		if (c.absX > 2619 && c.absX < 2622 && c.absY > 3680 && c.absY < 3689 && c.getItemAssistant().playerHasItem(995, 1000)) {
 			//Sailing.startTravel(c, 18);
 			c.getPlayerAssistant().startTeleport(2551, 3759, 0, "modern");
-			c.getItemAssistant().deleteItem2(995, 1000);
+			c.getItemAssistant().deleteItem(995, 1000);
 			c.getDialogueHandler().sendStatement("You arrive safely.");
 			c.nextChat = 0;
 		} else {
 			 if (c.getItemAssistant().playerHasItem(995, 1000)) {
 			//Sailing.startTravel(c, 17);	
 			c.getPlayerAssistant().startTeleport(2620, 3686, 0, "modern");
-			c.getItemAssistant().deleteItem2(995, 1000);
+			c.getItemAssistant().deleteItem(995, 1000);
 			c.getDialogueHandler().sendStatement("You arrive safely.");
 			c.nextChat = 0;
 			 }
@@ -1086,7 +1086,7 @@ public class NpcActions {
 		case 1042:
 			if (c.getItemAssistant().playerHasItem(995, 5)) {
 				c.getItemAssistant().addItem(2955, 1);
-				c.getItemAssistant().deleteItem2(995, 5);
+				c.getItemAssistant().deleteItem(995, 5);
 			} else {
 				c.getDialogueHandler().sendNpcChat1(
 						"You need 5 coins to buy a moonlight mead.",
@@ -1191,7 +1191,7 @@ public class NpcActions {
 			if (c.getItemAssistant().playerHasItem(995, 5)) {
 				c.getActionSender().sendMessage(
 						"You buy a shantay pass quickly.");
-				c.getItemAssistant().deleteItem2(995, 5);
+				c.getItemAssistant().deleteItem(995, 5);
 				c.getItemAssistant().addItem(1854, 1);
 			} else {
 				c.getActionSender().sendMessage(

2006Redone Server/src/redone/game/npcs/impl/MilkCow.java

@@ -32,7 +32,7 @@ public class MilkCow {
 
 				@Override
 				public void execute(CycleEventContainer container) {
-					c.getItemAssistant().deleteItem2(BUCKET, 1);
+					c.getItemAssistant().deleteItem(BUCKET, 1);
 					c.getActionSender().sendMessage("You milk the cow.");
 					c.getItemAssistant().addItem(BUCKET_OF_MILK, 1);
 					container.stop();

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

@@ -248,7 +248,7 @@ public class ObjectsActions {
 		}
 		if (player.absX == 2816 && player.getItemAssistant().playerHasItem(6306, 100)) {
 			player.getPlayerAssistant().movePlayer(player.absX+1, player.absY, 0);
-			player.getItemAssistant().deleteItem2(6306, 100);
+			player.getItemAssistant().deleteItem(6306, 100);
 		} else if (player.absX == 2817) {
 			player.getPlayerAssistant().movePlayer(player.absX+1, player.absY, 0);
 		}
@@ -340,12 +340,12 @@ public class ObjectsActions {
 			}
 			if (player.getItemAssistant().playerHasItem(954)
 					&& LightSources.playerHasLightSource(player)) {
-				player.getItemAssistant().deleteItem2(954, 1);
+				player.getItemAssistant().deleteItem(954, 1);
 				player.getPlayerAssistant().movePlayer(3168, 9572, 0);
 				return;
 			} else if (player.getItemAssistant().playerHasItem(954)
 					&& !LightSources.playerHasLightSource(player)) {
-				player.getItemAssistant().deleteItem2(954, 1);
+				player.getItemAssistant().deleteItem(954, 1);
 				player.getPlayerAssistant().movePlayer(3168, 9572, 0);
 				return;
 			} else {
@@ -1814,7 +1814,7 @@ public class ObjectsActions {
 				player.turnPlayerTo(player.objectX, player.objectY);
 				player.startAnimation(883);
 				player.getItemAssistant().addItem(2130, 1);
-				player.getItemAssistant().deleteItem2(1927, 1);
+				player.getItemAssistant().deleteItem(1927, 1);
 				player.getPlayerAssistant()
 						.addSkillXP(18, player.playerCooking);
 			} else {
@@ -1826,7 +1826,7 @@ public class ObjectsActions {
 		case 2072: // crate
 			if (player.getItemAssistant().playerHasItem(1963, 10)
 					&& player.luthas == true) {
-				player.getItemAssistant().deleteItem2(1963, 10);
+				player.getItemAssistant().deleteItem(1963, 10);
 				player.getDialogueHandler().sendStatement(
 						"You pack your bananas in the crate...");
 				player.getActionSender().sendMessage(
@@ -1834,7 +1834,7 @@ public class ObjectsActions {
 				player.bananas = 2;
 			} else if (player.getItemAssistant().playerHasItem(431, 1)
 					&& player.pirateTreasure == 1) {
-				player.getItemAssistant().deleteItem2(431, 1);
+				player.getItemAssistant().deleteItem(431, 1);
 				player.getDialogueHandler().sendStatement(
 						"You stash your rum in the crate");
 				player.pirateTreasure = 2;
@@ -2580,7 +2580,7 @@ public class ObjectsActions {
 				NpcHandler.spawnNpc(player, 457, player.getX(), player.getY() + 2, 0, 0, 0, 0, 0, 0, false, false);
 				player.getActionSender().sendMessage("You search the coffin.");
 			} else if (player.restGhost == 4 && player.getItemAssistant().playerHasItem(553, 1)) {
-				player.getItemAssistant().deleteItem2(553, 1);
+				player.getItemAssistant().deleteItem(553, 1);
 				player.getActionSender().sendMessage("You have freed the ghost!");
 				QuestRewards.restFinish(player);
 				NpcHandler.spawnNpc(player, 457, player.getX(), player.getY() + 2, 0, 0, 0, 0, 0, 0, false, false);
@@ -2633,7 +2633,7 @@ public class ObjectsActions {
 		}
 		if (player.absX == 2816 && player.getItemAssistant().playerHasItem(6306, 100)) {
 			player.getPlayerAssistant().movePlayer(player.absX+1, player.absY, 0);
-			player.getItemAssistant().deleteItem2(6306, 100);
+			player.getItemAssistant().deleteItem(6306, 100);
 		} else if (player.absX == 2817) {
 			player.getPlayerAssistant().movePlayer(player.absX+1, player.absY, 0);
 		}

2006Redone Server/src/redone/game/objects/impl/Climbing.java

@@ -1,6 +1,5 @@
 package redone.game.objects.impl;
 
-import redone.Constants;
 import redone.event.CycleEvent;
 import redone.event.CycleEventContainer;
 import redone.event.CycleEventHandler;
@@ -495,7 +494,7 @@ public class Climbing {
 				client.playerLevel[17] = client.getPlayerAssistant()
 						.getLevelForXP(client.playerXP[17]) - 1;
 				client.getPlayerAssistant().refreshSkill(17);
-				client.getItemAssistant().deleteItem2(1523, 1);
+				client.getItemAssistant().deleteItem(1523, 1);
 			} else if (!client.getItemAssistant().playerHasItem(1523, 1)
 					&& Misc.random(5) > 2) {
 				client.getActionSender().sendMessage(

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

@@ -10,7 +10,6 @@ import redone.event.CycleEventContainer;
 import redone.event.CycleEventHandler;
 import redone.game.content.combat.magic.MagicData;
 import redone.game.content.combat.prayer.PrayerDrain;
-import redone.game.content.combat.range.RangeData;
 import redone.game.content.minigames.FightPits;
 import redone.game.content.minigames.PestControl;
 import redone.game.content.minigames.castlewars.CastleWars;
@@ -372,10 +371,10 @@ public class PlayerAssistant {
 
 	public boolean removeGloves() {
 		if (player.getItemAssistant().playerHasItem(776)) {
-			player.getItemAssistant().deleteItem2(776, 1);
+			player.getItemAssistant().deleteItem(776, 1);
 			return true;
 		} else if (player.getItemAssistant().playerHasItem(775)) {
-			player.getItemAssistant().deleteItem2(775, 1);
+			player.getItemAssistant().deleteItem(775, 1);
 			return true;
 		} else if (player.playerEquipment[player.playerHands] == 775 || player.playerEquipment[player.playerHands] == 776) {
 			player.getDialogueHandler().sendStatement("You need to take your gloves off to do this.");
@@ -1876,7 +1875,7 @@ public class PlayerAssistant {
 				}
 				if (weapon == CastleWars.SARA_BANNER || weapon == CastleWars.ZAMMY_BANNER) {
 					player.getItemAssistant().removeItem(weapon, 3);
-					player.getItemAssistant().deleteItem2(weapon, 1);
+					player.getItemAssistant().deleteItem(weapon, 1);
 					CastleWars.dropFlag(player, weapon);
 				}
 				if (opponent.duelStatus == 5) {

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

@@ -3,7 +3,6 @@ package redone.game.players;
 import java.time.temporal.ValueRange;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import org.w3c.dom.ranges.Range;
 import redone.Constants;
 import redone.event.CycleEvent;
 import redone.event.CycleEventContainer;
@@ -12,7 +11,6 @@ import redone.game.content.minigames.castlewars.CastleWars;
 import redone.game.items.GameItem;
 import redone.game.items.Item;
 import redone.game.items.ItemAssistant;
-import redone.game.items.impl.RareProtection;
 import redone.util.GameLogger;
 import redone.util.Misc;
 
@@ -319,7 +317,7 @@ public class Trading {
 				if (item.id == itemID) {
 					inTrade = true;
 					item.amount += amount;
-					player.getItemAssistant().deleteItem2(itemID, amount);
+					player.getItemAssistant().deleteItem(itemID, amount);
 					o.getPlayerAssistant().sendFrame126(
 							"Trading with: " + player.playerName + " who has @gre@"
 									+ player.getItemAssistant().freeSlots()
@@ -330,7 +328,7 @@ public class Trading {
 
 			if (!inTrade) {
 				offeredItems.add(new GameItem(itemID, amount));
-				player.getItemAssistant().deleteItem2(itemID, amount);
+				player.getItemAssistant().deleteItem(itemID, amount);
 				o.getPlayerAssistant().sendFrame126(
 						"Trading with: " + player.playerName + " who has @gre@"
 								+ player.getItemAssistant().freeSlots()

2006Redone Server/src/redone/game/shops/ShopAssistant.java

@@ -574,7 +574,7 @@ public class ShopAssistant {
 
 			String itemName = ItemAssistant.getItemName(itemID).toLowerCase();
 			if (!showIsOwnedByThisPlayer) {
-				player.getItemAssistant().deleteItem2(currency, totalValue);
+				player.getItemAssistant().deleteItem(currency, totalValue);
 				player.getActionSender().sendMessage("You bought " + amount + " " + itemName + " for " + totalValue + " " + currencyName + "." );
 				// If it is a player owned shop, we need to give them the coins
 				if (ShopHandler.ShopSModifier[player.myShopId] == 0)

2006Redone Server/src/redone/net/packets/impl/ClickItem.java

@@ -56,7 +56,7 @@ public class ClickItem implements PacketType {
 			player.getActionSender().sendMessage("You setup a barricade.");
 		} else if (!CastleWars.isInCw(player) && itemId == 4053) {
 			player.getActionSender().sendMessage("You need to be in castlewars to drop a barricade.");
-			player.getItemAssistant().deleteItem2(itemId, player.getItemAssistant().getItemAmount(itemId));
+			player.getItemAssistant().deleteItem(itemId, player.getItemAssistant().getItemAmount(itemId));
 		}
 		if (itemId >= 5509 && itemId <= 5514) {
 			int pouch = -1;
@@ -81,20 +81,20 @@ public class ClickItem implements PacketType {
 		case 407:
 			if (Misc.random(1) == 0) {
 				player.getItemAssistant().addItem(409, 1);
-				player.getItemAssistant().deleteItem2(407, 1);
+				player.getItemAssistant().deleteItem(407, 1);
 			} else {
 				if (Misc.random(1) == 0) {
 					player.getItemAssistant().addItem(411, 1);
-					player.getItemAssistant().deleteItem2(409, 1);
+					player.getItemAssistant().deleteItem(409, 1);
 				} else if (Misc.random(1) == 1) {
 					player.getItemAssistant().addItem(413, 1);
-					player.getItemAssistant().deleteItem2(407, 1);
+					player.getItemAssistant().deleteItem(407, 1);
 				}
 			}
 		break;
 		
 		case 2329:
-			player.getItemAssistant().deleteItem2(2329, 1);
+			player.getItemAssistant().deleteItem(2329, 1);
 			player.getItemAssistant().addItem(2313, 1);
 		break;
 		
@@ -179,7 +179,7 @@ public class ClickItem implements PacketType {
 			break;
 
 		case 3691:
-			player.getItemAssistant().deleteItem2(3691, 1);
+			player.getItemAssistant().deleteItem(3691, 1);
 			player.getItemAssistant().addItem(3690, 1);
 			player.getPlayerAssistant().startTeleport(2661, 3310, 0, "modern");
 			break;
@@ -223,20 +223,20 @@ public class ClickItem implements PacketType {
 
 		case 2297:
 			player.getItemAssistant().addItem(2299, 1);
-			player.getItemAssistant().deleteItem2(2297, 1);
+			player.getItemAssistant().deleteItem(2297, 1);
 			break;
 
 		case 2299:
-			player.getItemAssistant().deleteItem2(2299, 1);
+			player.getItemAssistant().deleteItem(2299, 1);
 			break;
 
 		case 2301:
 			player.getItemAssistant().addItem(2303, 1);
-			player.getItemAssistant().deleteItem2(2301, 1);
+			player.getItemAssistant().deleteItem(2301, 1);
 			break;
 
 		case 2303:
-			player.getItemAssistant().deleteItem2(2303, 1);
+			player.getItemAssistant().deleteItem(2303, 1);
 			break;
 
 		case 2520:
@@ -267,7 +267,7 @@ public class ClickItem implements PacketType {
 			break;
 
 		case 2714:
-			player.getItemAssistant().deleteItem2(itemId, 1);
+			player.getItemAssistant().deleteItem(itemId, 1);
 			player.getItemAssistant().addItem(995, 450);
 			player.getItemAssistant().addItem(1639, 1);
 			player.getItemAssistant().addItem(1635, 1);

2006Redone Server/src/redone/net/packets/impl/ClickingButtons.java

@@ -224,9 +224,9 @@ public class ClickingButtons implements PacketType {
 				return;
 			}
 			if (System.currentTimeMillis() - player.boneDelay > 2000) {
-				player.getItemAssistant().deleteItem2(561, 1);
+				player.getItemAssistant().deleteItem(561, 1);
-				player.getItemAssistant().deleteItem2(557, 2);
+				player.getItemAssistant().deleteItem(557, 2);
-				player.getItemAssistant().deleteItem2(555, 2);
+				player.getItemAssistant().deleteItem(555, 2);
 				player.getPlayerAssistant().addSkillXP(40, 6);
 				player.getPlayerAssistant().refreshSkill(6);
 				player.startAnimation(722);
@@ -236,7 +236,7 @@ public class ClickingButtons implements PacketType {
 						SoundList.BONES_TO_BANNAS, 100, 0);
 				player.boneDelay = System.currentTimeMillis();
 				do {
-					player.getItemAssistant().deleteItem2(526, 1);
+					player.getItemAssistant().deleteItem(526, 1);
 					player.getItemAssistant().addItem(1963, 1);
 				} while (player.getItemAssistant().playerHasItem(526, 1));
 			}
@@ -272,9 +272,9 @@ public class ClickingButtons implements PacketType {
 				return;
 			}
 			if (System.currentTimeMillis() - player.boneDelay > 2000) {
-				player.getItemAssistant().deleteItem2(561, 2);
+				player.getItemAssistant().deleteItem(561, 2);
-				player.getItemAssistant().deleteItem2(557, 4);
+				player.getItemAssistant().deleteItem(557, 4);
-				player.getItemAssistant().deleteItem2(555, 4);
+				player.getItemAssistant().deleteItem(555, 4);
 				player.getPlayerAssistant().addSkillXP(40, 6);
 				player.getPlayerAssistant().refreshSkill(6);
 				player.startAnimation(722);
@@ -282,7 +282,7 @@ public class ClickingButtons implements PacketType {
 				player.getPlayerAssistant().sendFrame106(6);
 				player.boneDelay = System.currentTimeMillis();
 				do {
-					player.getItemAssistant().deleteItem2(526, 1);
+					player.getItemAssistant().deleteItem(526, 1);
 					player.getItemAssistant().addItem(6883, 1);
 				} while (player.getItemAssistant().playerHasItem(526, 1));
 			}
@@ -652,12 +652,12 @@ public class ClickingButtons implements PacketType {
 			break;
 
 		case 10193:
-			player.getItemAssistant().deleteItem2(995, 2000);
+			player.getItemAssistant().deleteItem(995, 2000);
 			player.getPlayerAssistant().removeAllWindows();
 			break;
 
 		case 8065:
-			player.getItemAssistant().deleteItem2(995, 2000);
+			player.getItemAssistant().deleteItem(995, 2000);
 			player.getPlayerAssistant().removeAllWindows();
 			break;
 		/** End of Hairdresser buttons */
@@ -1494,16 +1494,16 @@ public class ClickingButtons implements PacketType {
 				player.getDialogueHandler().sendDialogues(624, player.npcType);
 				return;
 			} else if (player.dialogueAction == 3204) {
-				player.getItemAssistant().deleteItem2(1929, 1);
+				player.getItemAssistant().deleteItem(1929, 1);
-				player.getItemAssistant().deleteItem2(1933, 1);
+				player.getItemAssistant().deleteItem(1933, 1);
 				player.getItemAssistant().addItem(1953, 1);
 				player.getItemAssistant().addItem(1925, 1);
 				player.getItemAssistant().addItem(1931, 1);
 				player.getPlayerAssistant().addSkillXP(1, player.playerCooking);
 				player.nextChat = 0;
 			} else if (player.dialogueAction == 3205) {
-				player.getItemAssistant().deleteItem2(1933, 1);
+				player.getItemAssistant().deleteItem(1933, 1);
-				player.getItemAssistant().deleteItem2(1937, 1);
+				player.getItemAssistant().deleteItem(1937, 1);
 				player.getItemAssistant().addItem(1953, 1);
 				player.getItemAssistant().addItem(1925, 1);
 				player.getItemAssistant().addItem(1935, 1);
@@ -1696,16 +1696,16 @@ public class ClickingButtons implements PacketType {
 				player.nextChat = 0;
 				return;
 			} else if (player.dialogueAction == 3204) {
-				player.getItemAssistant().deleteItem2(1929, 1);
+				player.getItemAssistant().deleteItem(1929, 1);
-				player.getItemAssistant().deleteItem2(1933, 1);
+				player.getItemAssistant().deleteItem(1933, 1);
 				player.getItemAssistant().addItem(2307, 1);
 				player.getItemAssistant().addItem(1925, 1);
 				player.getItemAssistant().addItem(1931, 1);
 				player.getPlayerAssistant().addSkillXP(1, player.playerCooking);
 				player.nextChat = 0;
 			} else if (player.dialogueAction == 3205) {
-				player.getItemAssistant().deleteItem2(1933, 1);
+				player.getItemAssistant().deleteItem(1933, 1);
-				player.getItemAssistant().deleteItem2(1937, 1);
+				player.getItemAssistant().deleteItem(1937, 1);
 				player.getItemAssistant().addItem(1953, 1);
 				player.getItemAssistant().addItem(1925, 1);
 				player.getItemAssistant().addItem(1935, 1);

2006Redone Server/src/redone/net/packets/impl/ItemClick3.java

@@ -67,12 +67,12 @@ public class ItemClick3 implements PacketType {
 			break;
 			
 		case 1933:
-			player.getItemAssistant().deleteItem2(1933, 1);
+			player.getItemAssistant().deleteItem(1933, 1);
 			player.getItemAssistant().addItem(1931, 1);
 		break;
 		
 		case 1921:
-			player.getItemAssistant().deleteItem2(1921, 1);
+			player.getItemAssistant().deleteItem(1921, 1);
 			player.getItemAssistant().addItem(1923, 1);
 		break;
 

2006Redone Server/src/redone/net/packets/impl/ItemOnNpc.java

@@ -40,20 +40,20 @@ public class ItemOnNpc implements PacketType {
 		break;
 		}
 		if (player.getItemAssistant().playerHasItem(995, 1) && npcId == 736) {
-			player.getItemAssistant().deleteItem2(995, 1);
+			player.getItemAssistant().deleteItem(995, 1);
 			player.getDialogueHandler().sendNpcChat1("Thanks!", player.npcType, "Emily");
 		}
 		if (player.getItemAssistant().playerHasItem(1927, 1) && player.gertCat == 2 && npcId == 2997) {
 			player.getDialogueHandler().sendDialogues(319, npcId);
-			player.getItemAssistant().deleteItem2(1927, 1);
+			player.getItemAssistant().deleteItem(1927, 1);
 			player.getItemAssistant().addItem(1925, 1);
 			player.gertCat = 3;
 		} else if (player.getItemAssistant().playerHasItem(1552, 1) && player.gertCat == 3 && npcId == 2997) {
 			player.getDialogueHandler().sendDialogues(323, npcId);
-			player.getItemAssistant().deleteItem2(1552, 1);
+			player.getItemAssistant().deleteItem(1552, 1);
 			player.gertCat = 4;
 		} else if (player.getItemAssistant().playerHasItem(1554, 1) && player.gertCat == 5 && npcId == 2997) {
-			player.getItemAssistant().deleteItem2(1554, 1);
+			player.getItemAssistant().deleteItem(1554, 1);
 			player.getDialogueHandler().sendDialogues(326, npcId);
 		}
 		UseItem.ItemonNpc(player, itemId, slot, i);

2006Redone Server/src/redone/net/packets/impl/ItemOnObject.java

@@ -43,8 +43,8 @@ public class ItemOnObject implements PacketType {
 						player.startAnimation(899);
 						player.getActionSender().sendSound(352, 100, 1);
 						player.getActionSender().sendMessage("You smelt the copper and tin together in the furnace.");
-						player.getItemAssistant().deleteItem2(438, 1);
+						player.getItemAssistant().deleteItem(438, 1);
-						player.getItemAssistant().deleteItem2(436, 1);
+						player.getItemAssistant().deleteItem(436, 1);
 						player.getActionSender().sendMessage("You retrieve a bar of bronze.");
 						player.getItemAssistant().addItem(2349, 1);
 						player.getDialogueHandler().sendDialogues(3062, -1);
@@ -52,8 +52,8 @@ public class ItemOnObject implements PacketType {
 						player.startAnimation(899);
 						player.getActionSender().sendSound(352, 100, 1);
 						player.getActionSender().sendMessage("You smelt the copper and tin together in the furnace.");
-						player.getItemAssistant().deleteItem2(438, 1);
+						player.getItemAssistant().deleteItem(438, 1);
-						player.getItemAssistant().deleteItem2(436, 1);
+						player.getItemAssistant().deleteItem(436, 1);
 						player.getActionSender().sendMessage("You retrieve a bar of bronze.");
 						player.getItemAssistant().addItem(2349, 1);
 					}
@@ -187,7 +187,7 @@ public class ItemOnObject implements PacketType {
 
 		if (itemId == 954 && objectId == 2327) {
 			player.getPlayerAssistant().movePlayer(2505, 3087, 0);
-			player.getItemAssistant().deleteItem2(954, 1);
+			player.getItemAssistant().deleteItem(954, 1);
 		} else if (objectId == 2327 && itemId != 954) {
 			player.getActionSender().sendMessage("You need a rope to swing across.");
 		}

2006Redone Server/src/redone/net/packets/impl/ItemOnPlayer.java

@@ -23,7 +23,7 @@ public class ItemOnPlayer implements PacketType {
 			Client o = (Client) PlayerHandler.players[playerId];
 			if (!RareProtection.CRACKERS && c.playerRights < 3) {
 				int delete = c.getItemAssistant().getItemCount(962);
-				c.getItemAssistant().deleteItem2(962, delete);
+				c.getItemAssistant().deleteItem(962, delete);
 				c.getActionSender().sendMessage("You can't do that!");
 				return;
 			}

2006Redone Server/src/redone/net/packets/impl/Walking.java

@@ -193,8 +193,10 @@ public class Walking implements PacketType {
 			firstStepY = realY - player.getMapRegionY() * 8;
 		}
 
-		if (player.distanceToPoint(realX, realY) > 30) {
+		if (!player.clickToTele) {
-			return;
+			if (player.distanceToPoint(realX, realY) > 30) {
+				return;
+			}
 		}
 
 		player.setNewWalkCmdIsRunning(player.getInStream().readSignedByteC() == 1 && player.playerEnergy > 0);