Merge branch 'master' of https://github.com/dginovker/2006rebotted

- added poison arrows to usable arrows
- cleaned up some code
- changed ardougne tele to correct coords
- enabled pest control (although it needs a lot of work still)
- fixed some typos
- made beads drop a bit more often, so its more accurate like real rs

2006Redone Client/src/Game.java

@@ -9503,13 +9503,13 @@ public class Game extends RSApplet {
 		if (loginScreenState == 3) {
 			chatTextDrawingArea.method382(0xffff00, c / 2, "Create a free account", c1 / 2 - 60, true);
 			int k = c1 / 2 - 35;
-			chatTextDrawingArea.method382(0xffffff, c / 2, "To create a new account you need to", k, true);
+			chatTextDrawingArea.method382(0xffffff, c / 2, "To create a new account just click", k, true);
 			k += 15;
-			chatTextDrawingArea.method382(0xffffff, c / 2, "go back to the main " + ClientSettings.SERVER_NAME + " webpage", k, true);
+			chatTextDrawingArea.method382(0xffffff, c / 2, "\"Cancel\" below, and click \"Existing User\".", k, true);
 			k += 15;
-			chatTextDrawingArea.method382(0xffffff, c / 2, "and choose the red 'create account'", k, true);
+			chatTextDrawingArea.method382(0xffffff, c / 2, "Log in with any credentials you want and an", k, true);
 			k += 15;
-			chatTextDrawingArea.method382(0xffffff, c / 2, "button at the top right of that page.", k, true);
+			chatTextDrawingArea.method382(0xffffff, c / 2, "account will automatically be created for you.", k, true);
 			k += 15;
 			int j1 = c / 2;
 			int i2 = c1 / 2 + 50;

2006Redone Client/src/ItemDef.java

@@ -190,7 +190,11 @@ public final class ItemDef {
 
 		cacheIndex = (cacheIndex + 1) % 10;
 		ItemDef itemDef = cache[cacheIndex];
-		stream.currentOffset = streamIndices[i];
+		try {
+			stream.currentOffset = streamIndices[i];
+		} catch (Exception e) {
+			System.out.println("Itemdef issue? Apparently this ID is out of bounds: " + e);
+		}
 		itemDef.id = i;
 		itemDef.setDefaults();
 		itemDef.readValues(stream);

2006Redone Server/data/cfg/shops.cfg

@@ -103,7 +103,7 @@ shop = 102	Zanaris_General_Store	1	1	1931	30	1935	10	1735	10	1925	30	1923	10	590
 shop = 103	Shantay_Store	2	2	1823	30	1831	30	1937	10	1921	10	1929	10	946	10	1833	10	1835	10	1837	10	2349	0	314	1000	2347	10	1925	30	1923	10	1935	10	954	100	1854	100
 shop = 104	Varrock_Sword_Shop	2	2	1277	10	1279	10	1281	10	1283	10	1285	10	1287	10	1291	10	1293	10	1295	10	1297	10	1299	10	1301	10	1205	10	1203	10	1207	10	1209	10	1211	10
 shop = 105	Taverly_Sword_Shop	2	2	1307	10	1309	10	1311	10	1313	10	1315	10	1317	10
-shop = 106	Jukats_Sword_Shop	2	2	1305	10	1215	30
+shop = 106	Jukats_Sword_Shop	2	2	1305	2	1215	2
 shop = 107	Oziachs_Armour	2	2	1127	10	1135	10
 shop = 108	Fur_Trader	2	2	948	10	958	10
 shop = 109	Slayer_Shop	2	2	4155	10	4166	10	4161	20	6696	20	7051	10	4551	10	7159	10	6720	10	4168	10	4164	10	4158	10	4172	50000	4170	10	7432	10	7421	1000	4162	10	4156	10

2006Redone Server/runServer.sh

@@ -4,5 +4,5 @@ for i in {0..50}
 do
     rm -rf com/
     cp -r ../CompiledServer/production/2006rebotted/com .
-    java -Xmx15G -cp ".:./libs/*" com.rebotted.GameEngine
+    java -Xmx15G -cp ".:./libs/*" com.rebotted.GameEngine | tee -a server_running_output.txt
 done

2006Redone Server/src/com/rebotted/game/content/combat/CombatAssistant.java

@@ -62,6 +62,9 @@ public class CombatAssistant {
 				NpcHandler.npcs[i].updateRequired = true;
 			}
 			if (CombatConstants.COMBAT_SOUNDS) {
+				if (PestControl.npcIsPCMonster(NpcHandler.npcs[i].npcType) || PestControl.isPCPortal(NpcHandler.npcs[i].npcType)) {
+					return;
+				}
 				c.getPacketSender().sendSound(CombatSounds.getNpcBlockSound(NpcHandler.npcs[c.oldNpcIndex].npcType), 100, 0);
 			}
 			NpcHandler.npcs[i].facePlayer(c.playerId);
@@ -152,7 +155,7 @@ public class CombatAssistant {
 					c.getPlayerAssistant().refreshSkill(4);
 				}
 				if (damage > 0) {
-					if (NpcHandler.npcs[i].npcType >= 3777 && NpcHandler.npcs[i].npcType <= 3780 || PestControl.npcIsPCMonster(NpcHandler.npcs[i].npcType)) {
+					if (PestControl.npcIsPCMonster(NpcHandler.npcs[i].npcType) || PestControl.isPCPortal(NpcHandler.npcs[i].npcType)) {
 						c.pcDamage += damage;
 					}
 				}
@@ -232,7 +235,7 @@ public class CombatAssistant {
 				c.getPlayerAssistant().refreshSkill(6);
 
 				if (damage > 0) {
-					if (NpcHandler.npcs[i].npcType >= 3777 && NpcHandler.npcs[i].npcType <= 3780 || PestControl.npcIsPCMonster(NpcHandler.npcs[i].npcType)) {
+					if (PestControl.npcIsPCMonster(NpcHandler.npcs[i].npcType) || PestControl.isPCPortal(NpcHandler.npcs[i].npcType)) {
 						c.pcDamage += damage;
 					}
 				}
@@ -353,7 +356,7 @@ public class CombatAssistant {
 			}
 		}
 		if (damage > 0) {
-			if (NpcHandler.npcs[i].npcType >= 3777 && NpcHandler.npcs[i].npcType <= 3780 || PestControl.npcIsPCMonster(NpcHandler.npcs[i].npcType)) {
+			if (PestControl.npcIsPCMonster(NpcHandler.npcs[i].npcType) || PestControl.isPCPortal(NpcHandler.npcs[i].npcType)) {
 				c.pcDamage += damage;
 			}
 		}

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

@@ -2,15 +2,9 @@ package com.rebotted.game.content.combat.magic;
 
 import com.rebotted.game.content.randomevents.RandomEventHandler;
 import com.rebotted.game.players.Player;
-import com.rebotted.util.Misc;
 
 public class MagicTeleports {
 
-	public static final int AIR_RUNE = 556, FIRE_RUNE = 554,
-			WATER_RUNE = 555, EARTH_RUNE = 557,
-			LAW_RUNE = 563, BLOOD_RUNE = 565,
-			SOUL_RUNE = 566, BANANA = 1963;
-
 	public static void handleLoginText(Player player) {
 		player.getPacketSender().sendFrame126("Level 25: Varrock Teleport", 1300);
 		player.getPacketSender().sendFrame126("Level 31: Lumbridge Teleport", 1325);
@@ -24,402 +18,44 @@ public class MagicTeleports {
 		player.getPacketSender().sendFrame126("Level 78: Dareeyak Teleport", 13071);
 	}
 
-	/**
-	 * Modern Teleports
-	 */
-	public static final int VARROCK_X = 3213, VARROCK_Y = 3423;
-	public static final int LUMBRIDGE_X = 3222, LUMBRIDGE_Y = 3218;
-	public static final int FALADOR_X = 2964, FALADOR_Y = 3378;
-	public static final int CAMELOT_X = 2757, CAMELOT_Y = 3479;
-	public static final int ARDOUGNE_X = 2662, ARDOUGNE_Y = 3305;
-	public static final int WATCHTOWER_X = 2547, WATCHTOWER_Y = 3112;
-	public static final int TROLLHEIM_X = 2910, TROLLHEIM_Y = 3612;
-	public static final int APE_ATOLL_X = 2754, APE_ATOLL_Y = 2784;
-
-	/**
-	 * Ancient Teleports
-	 */
-	public static final int PADDEWWA_X = 3098, PADDEWWA_Y = 9884;
-	public static final int SENNTISTEN_X = 3321, SENNTISTEN_Y = 3335;
-	public static final int KHARYRLL_X = 3493, KHARYRLL_Y = 3472;
-	public static final int LASSAR_X = 3006, LASSAR_Y = 3471;
-	public static final int DAREEYAK_X = 3161, DAREEYAK_Y = 3671;
-	public static final int CARRALLANGAR_X = 3157, CARRALLANGAR_Y = 3669;
-	public static final int ANNAKARL_X = 3286, ANNAKARL_Y = 3884;
-	public static final int GHORROCK_X = 2977, GHORROCK_Y = 3873;
-
 	public static final boolean MAGIC_LEVEL_REQUIRED = true, RUNES_REQUIRED = true;
 
-	public static boolean teleportCheck(Player player) {
+	public static void handleSpellTeleport(Player player, SpellTeleport teleport) {
 		if (player.teleTimer > 0) {
-			return false;
+			return;
 		}
-		return true;
+		if (player.wildLevel > 20) {
-	}
+			player.getPacketSender().sendMessage("You can't teleport above level 20 wilderness.");
-
+			return;
-	public static void paddewwaTeleport(Player player) {
+		}
-		if (!teleportCheck(player)) {
+		if (player.playerLevel[player.playerMagic] < teleport.getRequiredLevel()) {
+			player.getPacketSender().sendMessage("You need a magic level of " + teleport.getRequiredLevel() + " to cast this spell.");
+			return;
+		}
+		if (!CastRequirements.hasRunes(player, teleport.getRequiredRunes())) {
+			player.getPacketSender().sendMessage("You don't have the required runes to cast this spell.");
 			return;
 		}
 		RandomEventHandler.addRandom(player);
-		if (RUNES_REQUIRED) {
+		CastRequirements.deleteRunes(player, teleport.getRequiredRunes());
-			if (!CastRequirements.hasRunes(player, new int[][]{{LAW_RUNE, 2}, {FIRE_RUNE, 1}, {AIR_RUNE, 1}})) {
+		player.getPlayerAssistant().startTeleport(teleport.getDestX(), teleport.getDestY(), teleport.getDestZ(), teleport.getType());
-				player.getPacketSender().sendMessage("You don't have the required runes to cast this spell.");
+		player.getPlayerAssistant().addSkillXP(teleport.getExperienceGained(), player.playerMagic);
-				return;
-			}
-		}
-		if (MAGIC_LEVEL_REQUIRED) {
-			if (player.playerLevel[player.playerMagic] < 54) {
-				player.getPacketSender().sendMessage("You need a magic level of 54 to cast this spell.");
-				return;
-			}
-		}
-		CastRequirements.deleteRunes(player, new int[][]{{LAW_RUNE, 2}, {FIRE_RUNE, 1}, {AIR_RUNE, 1}});
-		player.getPlayerAssistant().startTeleport(PADDEWWA_X + Misc.random(2), PADDEWWA_Y - Misc.random(2), 0, "ancient");
-		player.getPlayerAssistant().addSkillXP(64, player.playerMagic);
 	}
 
-	public static void senntisenTeleport(Player player) {
-		if (!teleportCheck(player)) {
-			return;
-		}
-		RandomEventHandler.addRandom(player);
-		if (RUNES_REQUIRED) {
-			if (!CastRequirements.hasRunes(player, new int[][]{{LAW_RUNE, 2}, {SOUL_RUNE, 1}})) {
-				player.getPacketSender().sendMessage("You don't have the required runes to cast this spell.");
-				return;
-			}
-		}
-		if (MAGIC_LEVEL_REQUIRED) {
-			if (player.playerLevel[player.playerMagic] < 60) {
-				player.getPacketSender().sendMessage("You need a magic level of 60 to cast this spell.");
-				return;
-			}
-		}
-		CastRequirements.deleteRunes(player, new int[][]{{LAW_RUNE, 2}, {SOUL_RUNE, 1}});
-		player.getPlayerAssistant().startTeleport(SENNTISTEN_X + Misc.random(1), SENNTISTEN_Y - Misc.random(1), 0, "ancient");
-		player.getPlayerAssistant().addSkillXP(70, player.playerMagic);
-	}
 
-	public static void kharyllTeleport(Player player) {
-		if (!teleportCheck(player)) {
-			return;
-		}
-		RandomEventHandler.addRandom(player);
-		if (RUNES_REQUIRED) {
-			if (!CastRequirements.hasRunes(player, new int[][]{{LAW_RUNE, 2}, {BLOOD_RUNE, 1}})) {
-				player.getPacketSender().sendMessage("You don't have the required runes to cast this spell.");
-				return;
-			}
-		}
-		if (MAGIC_LEVEL_REQUIRED) {
-			if (player.playerLevel[player.playerMagic] < 66) {
-				player.getPacketSender().sendMessage("You need a magic level of 66 to cast this spell.");
-				return;
-			}
-		}
-		CastRequirements.deleteRunes(player, new int[][]{{LAW_RUNE, 2}, {BLOOD_RUNE, 1}});
-		player.getPlayerAssistant().startTeleport(KHARYRLL_X, KHARYRLL_Y, 0, "ancient");
-		player.getPlayerAssistant().addSkillXP(76, player.playerMagic);
-	}
 
-	public static void lassarTeleport(Player player) {
-		if (!teleportCheck(player)) {
-			return;
-		}
-		RandomEventHandler.addRandom(player);
-		if (RUNES_REQUIRED) {
-			if (!CastRequirements.hasRunes(player, new int[][]{{LAW_RUNE, 2}, {WATER_RUNE, 4}})) {
-				player.getPacketSender().sendMessage("You don't have the required runes to cast this spell.");
-				return;
-			}
-		}
-		if (MAGIC_LEVEL_REQUIRED) {
-			if (player.playerLevel[player.playerMagic] < 72) {
-				player.getPacketSender().sendMessage("You need a magic level of 72 to cast this spell.");
-				return;
-			}
-		}
-		CastRequirements.deleteRunes(player, new int[][]{{LAW_RUNE, 2}, {WATER_RUNE, 4}});
-		player.getPlayerAssistant().startTeleport(LASSAR_X + Misc.random(2), LASSAR_Y - Misc.random(2), 0, "ancient");
-		player.getPlayerAssistant().addSkillXP(82, player.playerMagic);
-	}
 
-	public static void dareeyakTeleport(Player player) {
-		if (!teleportCheck(player)) {
-			return;
-		}
-		RandomEventHandler.addRandom(player);
-		if (RUNES_REQUIRED) {
-			if (!CastRequirements.hasRunes(player, new int[][]{{LAW_RUNE, 2}, {FIRE_RUNE, 3}, {AIR_RUNE, 2}})) {
-				player.getPacketSender().sendMessage("You don't have the required runes to cast this spell.");
-				return;
-			}
-		}
-		if (MAGIC_LEVEL_REQUIRED) {
-			if (player.playerLevel[player.playerMagic] < 78) {
-				player.getPacketSender().sendMessage("You need a magic level of 78 to cast this spell.");
-				return;
-			}
-		}
-		CastRequirements.deleteRunes(player, new int[][]{{LAW_RUNE, 2}, {FIRE_RUNE, 3}, {AIR_RUNE, 2}});
-		player.getPlayerAssistant().startTeleport(
-				DAREEYAK_X + Misc.random(1),
-				DAREEYAK_Y - Misc.random(1), 0, "ancient");
-		player.getPlayerAssistant().addSkillXP(88, player.playerMagic);
-	}
 
-	public static void carrallangarTeleport(Player player) {
-		if (!teleportCheck(player)) {
-			return;
-		}
-		RandomEventHandler.addRandom(player);
-		if (RUNES_REQUIRED) {
-			if (!CastRequirements.hasRunes(player, new int[][]{{LAW_RUNE, 2}, {SOUL_RUNE, 2}})) {
-				player.getPacketSender()
-						.sendMessage(
-								"You don't have the required runes to cast this spell.");
-				return;
-			}
-		}
-		if (MAGIC_LEVEL_REQUIRED) {
-			if (player.playerLevel[player.playerMagic] < 84) {
-				player.getPacketSender().sendMessage("You need a magic level of 84 to cast this spell.");
-				return;
-			}
-		}
-		CastRequirements.deleteRunes(player, new int[][]{{LAW_RUNE, 2}, {SOUL_RUNE, 2}});
-		player.getPlayerAssistant().startTeleport(CARRALLANGAR_X + Misc.random(2), CARRALLANGAR_Y - Misc.random(2), 0, "ancient");
-		player.getPlayerAssistant().addSkillXP(94, player.playerMagic);
-	}
 
-	public static void annakarlTeleport(Player player) {
-		if (!teleportCheck(player)) {
-			return;
-		}
-		RandomEventHandler.addRandom(player);
-		if (RUNES_REQUIRED) {
-			if (!CastRequirements.hasRunes(player, new int[][]{{LAW_RUNE, 2}, {BLOOD_RUNE, 2}})) {
-				player.getPacketSender().sendMessage("You don't have the required runes to cast this spell.");
-				return;
-			}
-		}
-		if (MAGIC_LEVEL_REQUIRED) {
-			if (player.playerLevel[player.playerMagic] < 90) {
-				player.getPacketSender().sendMessage("You need a magic level of 90 to cast this spell.");
-				return;
-			}
-		}
-		CastRequirements.deleteRunes(player, new int[][]{{LAW_RUNE, 2}, {BLOOD_RUNE, 2}});
-		player.getPlayerAssistant().startTeleport(ANNAKARL_X + Misc.random(1), ANNAKARL_Y - Misc.random(1), 0, "ancient");
-		player.getPlayerAssistant().addSkillXP(100, player.playerMagic);
-	}
 
-	public static void ghorrockTeleport(Player player) {
-		if (!teleportCheck(player)) {
-			return;
-		}
-		RandomEventHandler.addRandom(player);
-		if (RUNES_REQUIRED) {
-			if (!CastRequirements.hasRunes(player, new int[][]{{LAW_RUNE, 2}, {WATER_RUNE, 8}})) {
-				player.getPacketSender().sendMessage("You don't have the required runes to cast this spell.");
-				return;
-			}
-		}
-		if (MAGIC_LEVEL_REQUIRED) {
-			if (player.playerLevel[player.playerMagic] < 96) {
-				player.getPacketSender().sendMessage("You need a magic level of 96 to cast this spell.");
-				return;
-			}
-		}
-		CastRequirements.deleteRunes(player, new int[][]{{LAW_RUNE, 2}, {WATER_RUNE, 8}});
-		player.getPlayerAssistant().startTeleport(GHORROCK_X + Misc.random(3),
-				GHORROCK_Y - Misc.random(3), 0, "ancient");
-		player.getPlayerAssistant().addSkillXP(106, player.playerMagic);
-	}
 
-	public static void varrockTeleport(Player player) {
-		if (!teleportCheck(player)) {
-			return;
-		}
-		RandomEventHandler.addRandom(player);
-		if (RUNES_REQUIRED) {
-			if (!CastRequirements.hasRunes(player, new int[][]{{LAW_RUNE, 1}, {FIRE_RUNE, 1}, {AIR_RUNE, 3}})) {
-				player.getPacketSender().sendMessage("You don't have the required runes to cast this spell.");
-				return;
-			}
-		}
-		if (MAGIC_LEVEL_REQUIRED) {
-			if (player.playerLevel[player.playerMagic] < 25) {
-				player.getPacketSender().sendMessage("You need a magic level of 25 to cast this spell.");
-				return;
-			}
-		}
-		CastRequirements.deleteRunes(player, new int[][]{{LAW_RUNE, 1}, {FIRE_RUNE, 1}, {AIR_RUNE, 3}});
-		player.getPlayerAssistant().startTeleport(VARROCK_X + Misc.random(2), VARROCK_Y - Misc.random(2), 0, "modern");
-		player.getPlayerAssistant().addSkillXP(35, player.playerMagic);
-	}
 
-	public static void lumbridgeTeleport(Player player) {
-		if (!teleportCheck(player)) {
-			return;
-		}
-		RandomEventHandler.addRandom(player);
-		if (RUNES_REQUIRED) {
-			if (!CastRequirements.hasRunes(player, new int[][]{{LAW_RUNE, 1}, {EARTH_RUNE, 1}, {AIR_RUNE, 3}})) {
-				player.getPacketSender().sendMessage("You don't have the required runes to cast this spell.");
-				return;
-			}
-		}
-		if (MAGIC_LEVEL_REQUIRED) {
-			if (player.playerLevel[player.playerMagic] < 31) {
-				player.getPacketSender().sendMessage("You need a magic level of 31 to cast this spell.");
-				return;
-			}
-		}
-		CastRequirements.deleteRunes(player, new int[][]{{LAW_RUNE, 1}, {EARTH_RUNE, 1}, {AIR_RUNE, 3}});
-		player.getPlayerAssistant().startTeleport(LUMBRIDGE_X, LUMBRIDGE_Y, 0, "modern");
-		player.getPlayerAssistant().addSkillXP(35, player.playerMagic);
-	}
 
-	public static void faladorTeleport(Player player) {
-		/*if (!teleportCheck(player)) {
-			return;
-		}*/
-		RandomEventHandler.addRandom(player);
-		if (RUNES_REQUIRED) {
-			if (!CastRequirements.hasRunes(player, new int[][]{{LAW_RUNE, 1}, {WATER_RUNE, 1}, {AIR_RUNE, 3}})) {
-				player.getPacketSender().sendMessage("You don't have the required runes to cast this spell.");
-				return;
-			}
-		}
-		if (MAGIC_LEVEL_REQUIRED) {
-			if (player.playerLevel[player.playerMagic] < 37) {
-				player.getPacketSender().sendMessage("You need a magic level of 37 to cast this spell.");
-				return;
-			}
-		}
-		CastRequirements.deleteRunes(player, new int[][]{{LAW_RUNE, 1}, {WATER_RUNE, 1}, {AIR_RUNE, 3}});
-		player.getPlayerAssistant().startTeleport(FALADOR_X + Misc.random(4), FALADOR_Y - Misc.random(4), 0, "modern");
-		player.getPlayerAssistant().addSkillXP(48, player.playerMagic);
-	}
 
-	public static void camelotTeleport(Player player) {
-		if (!teleportCheck(player)) {
-			return;
-		}
-		RandomEventHandler.addRandom(player);
-		if (RUNES_REQUIRED) {
-			if (!CastRequirements.hasRunes(player, new int[][]{{LAW_RUNE, 1}, {AIR_RUNE, 5}})) {
-				player.getPacketSender().sendMessage("You don't have the required runes to cast this spell.");
-				return;
-			}
-		}
-		if (MAGIC_LEVEL_REQUIRED) {
-			if (player.playerLevel[player.playerMagic] < 45) {
-				player.getPacketSender().sendMessage("You need a magic level of 45 to cast this spell.");
-				return;
-			}
-		}
-		CastRequirements.deleteRunes(player, new int[][]{{LAW_RUNE, 1}, {AIR_RUNE, 5}});
-		// 2757, 3479
-		player.getPlayerAssistant().startTeleport(CAMELOT_X + Misc.random(1), CAMELOT_Y - Misc.random(1), 0, "modern");
-		player.getPlayerAssistant().addSkillXP(55.5, player.playerMagic);
-	}
 
-	public static void ardougneTeleport(Player player) {
-		if (!teleportCheck(player)) {
-			return;
-		}
-		RandomEventHandler.addRandom(player);
-		if (RUNES_REQUIRED) {
-			if (!CastRequirements.hasRunes(player, new int[][]{{LAW_RUNE, 2}, {WATER_RUNE, 2}})) {
-				player.getPacketSender().sendMessage("You don't have the required runes to cast this spell.");
-				return;
-			}
-		}
-		if (MAGIC_LEVEL_REQUIRED) {
-			if (player.playerLevel[player.playerMagic] < 51) {
-				player.getPacketSender().sendMessage("You need a magic level of 51 to cast this spell.");
-				return;
-			}
-		}
-		CastRequirements.deleteRunes(player, new int[][]{{LAW_RUNE, 2}, {WATER_RUNE, 2}});
-		player.getPlayerAssistant().startTeleport(ARDOUGNE_X + Misc.random(4),
-				ARDOUGNE_Y - Misc.random(4), 0, "modern");
-		player.getPlayerAssistant().addSkillXP(61, player.playerMagic);
-	}
 
-	public static void watchTowerTeleport(Player player) {
-		if (!teleportCheck(player)) {
-			return;
-		}
-		RandomEventHandler.addRandom(player);
-		if (RUNES_REQUIRED) {
-			if (!CastRequirements.hasRunes(player, new int[][]{{LAW_RUNE, 2}, {EARTH_RUNE, 2}})) {
-				player.getPacketSender().sendMessage("You don't have the required runes to cast this spell.");
-				return;
-			}
-		}
-		if (MAGIC_LEVEL_REQUIRED) {
-			if (player.playerLevel[player.playerMagic] < 58) {
-				player.getPacketSender().sendMessage(
-						"You need a magic level of 58 to cast this spell.");
-				return;
-			}
-		}
-		CastRequirements.deleteRunes(player, new int[][]{{LAW_RUNE, 2}, {EARTH_RUNE, 2}});
-		player.getPlayerAssistant().startTeleport(WATCHTOWER_X, WATCHTOWER_Y, 1, "modern");
-		player.getPlayerAssistant().addSkillXP(68, player.playerMagic);
-	}
 
-	public static void trollhiemTeleport(Player player) {
-		if (!teleportCheck(player)) {
-			return;
-		}
-		RandomEventHandler.addRandom(player);
-		if (RUNES_REQUIRED) {
-			if (!CastRequirements.hasRunes(player, new int[][]{{LAW_RUNE, 2}, {FIRE_RUNE, 2}})) {
-				player.getPacketSender().sendMessage("You don't have the required runes to cast this spell.");
-				return;
-			}
-		}
-		if (MAGIC_LEVEL_REQUIRED) {
-			if (player.playerLevel[player.playerMagic] < 61) {
-				player.getPacketSender().sendMessage("You need a magic level of 61 to cast this spell.");
-				return;
-			}
-		}
-		CastRequirements.deleteRunes(player, new int[][]{{LAW_RUNE, 2}, {FIRE_RUNE, 2}});
-		player.getPlayerAssistant().startTeleport(2892 + Misc.random(2),
-				3679 - Misc.random(2), 0, "modern");
-		player.getPlayerAssistant().addSkillXP(68, player.playerMagic);
-	}
 
-	public static void apeAtollTeleport(Player player) {
+
-		if (!teleportCheck(player)) {
+
-			return;
-		}
-		RandomEventHandler.addRandom(player);
-		if (RUNES_REQUIRED) {
-			if (!CastRequirements.hasRunes(player, new int[][]{{LAW_RUNE, 2}, {FIRE_RUNE, 2}, {WATER_RUNE, 2}}) || !player.getItemAssistant().playerHasItem(BANANA, 1)) {
-				player.getPacketSender().sendMessage("You don't have the required items to cast this spell.");
-				return;
-			}
-		}
-		if (player.questPoints < 19) {
-			player.getPacketSender().sendMessage("You need " + 19 + " quest points to teleport here.");
-			return;
-		}
-		if (MAGIC_LEVEL_REQUIRED) {
-			if (player.playerLevel[player.playerMagic] < 64) {
-				player.getPacketSender().sendMessage("You need a magic level of 64 to cast this spell.");
-				return;
-			}
-		}
-		CastRequirements.deleteRunes(player, new int[][]{{LAW_RUNE, 2}, {FIRE_RUNE, 2}, {WATER_RUNE, 2}});
-		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/com/rebotted/game/content/combat/magic/SpellTeleport.java

@@ -0,0 +1,82 @@
+package com.rebotted.game.content.combat.magic;
+
+public enum SpellTeleport {
+
+    VARROCK(25, 4140, 35, 3213, 3422, 0, new int[][]{{563, 1}, {554, 1}, {556, 3}}, "modern"),
+    LUMBRIDGE(31,4143, 41, 3222, 3218, 0, new int[][]{{563, 1}, {557, 1}, {556, 3}}, "modern"),
+    FALADOR(37, 4146, 48, 2965, 3378, 0, new int[][]{{563, 1}, {555, 1}, {556, 3}}, "modern"),
+    CAMELOT(45, 4150, 55.5, 2757, 3479, 0, new int[][]{{563, 1}, {556, 5}}, "modern"),
+    ARDOUGNE(51, 6004, 61, 2662, 3304, 0, new int[][]{{563, 2}, {555, 2}}, "modern"),
+    WATCHTOWER(58, 6005, 68, 2547, 3112, 1, new int[][]{{563, 2}, {557, 2}}, "modern"),
+    TROLLHEIM(61, 29031, 68, 2893, 3679, 0, new int[][]{{563, 2}, {554, 2}}, "modern"),
+    APE_ATOLL(64, 72038, 74, 2798, 2798, 1, new int[][]{{563, 2}, {554, 2}, {555, 2}, {1963, 1}}, "modern"),
+    PADDEWWA(54, 50235, 64, 3098, 9884, 0, new int[][] {{563, 2}, {554, 1}, {556, 1}}, "ancient"),
+    SENNTISTEN(60, 50245, 70, 3321, 3335, 0, new int[][] {{566, 1}, {563, 2}}, "ancient"),
+    KHARYLL(66, 50253, 76, 3493, 3472, 0, new int[][] {{565, 1}, {563, 2}}, "ancient"),
+    LASSAR(72, 51005, 82, 3006, 3471, 0, new int[][] {{563, 2}, {555, 4}}, "ancient"),
+    DAREEYAK(78, 51013, 88, 3161, 3671, 0, new int[][] {{563, 2}, {554, 3}, {556, 2}}, "ancient"),
+    CARRALLANGAR(84, 51023, 94, 3157, 3669, 0, new int[][] {{566, 2}, {563, 2}}, "ancient"),
+    ANNAKARL(90, 51031, 100, 3286, 3884, 0, new int[][] {{565, 2}, {563, 2}}, "ancient"),
+    GHORROCK(96, 51039, 106, 2977, 3873, 0, new int[][] {{563, 2}, {555, 8}}, "ancient");
+
+    int requiredLevel, buttonId, destX, destY, destZ;
+    double experienceGained;
+    int[][] requiredRunes;
+    String type;
+
+    SpellTeleport(int requiredLevel, int buttonId, double experienceGained, int destX, int destY, int destZ, int[][] requiredRunes, String type) {
+        this.requiredLevel = requiredLevel;
+        this.buttonId = buttonId;
+        this.experienceGained = experienceGained;
+        this.destX = destX;
+        this.destY = destY;
+        this.destZ = destZ;
+        this.requiredRunes = requiredRunes;
+        this.type = type;
+    }
+
+    public int getRequiredLevel() {
+        return requiredLevel;
+    }
+
+    public int getButtonId() {
+        return buttonId;
+    }
+
+    public int getDestX() {
+        return destX;
+    }
+
+    public int getDestY() {
+        return destY;
+    }
+
+    public int getDestZ(){
+        return destZ;
+    }
+
+    public int[][] getRequiredRunes() {
+        return requiredRunes;
+    }
+
+    public double getExperienceGained() {
+        return experienceGained;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public static SpellTeleport forButtonId(int id) {
+        for (SpellTeleport t : values()) {
+            if (t != null) {
+                if (t.getButtonId() == id) {
+                    return t;
+                }
+            }
+        }
+        return null;
+    }
+
+
+}

2006Redone Server/src/com/rebotted/game/content/combat/npcs/NpcCombat.java

@@ -5,6 +5,7 @@ import com.rebotted.game.content.combat.CombatAssistant;
 import com.rebotted.game.content.combat.CombatConstants;
 import com.rebotted.game.content.combat.melee.MeleeData;
 import com.rebotted.game.content.minigames.FightCaves;
+import com.rebotted.game.content.minigames.PestControl;
 import com.rebotted.game.content.music.sound.CombatSounds;
 import com.rebotted.game.content.music.sound.SoundList;
 import com.rebotted.game.npcs.NpcData;
@@ -182,14 +183,11 @@ public class NpcCombat {
 					NpcHandler.npcs[i].attackTimer = NpcData.getNpcDelay(i);
 					NpcHandler.npcs[i].hitDelayTimer = NpcData.getHitDelay(i);
 					NpcHandler.npcs[i].attackType = 0;
-					if (CombatConstants.COMBAT_SOUNDS
+					if (CombatConstants.COMBAT_SOUNDS) {
-							&& NpcHandler.npcs[i].npcType < 3177
+						if (PestControl.npcIsPCMonster(NpcHandler.npcs[i].npcType) || PestControl.isPCPortal(NpcHandler.npcs[i].npcType)) {
-							&& NpcHandler.npcs[i].npcType > 3180) {
+							return;
-						c.getPacketSender()
+						}
-								.sendSound(
+						c.getPacketSender().sendSound(CombatSounds.getNpcAttackSounds(NpcHandler.npcs[i].npcType), 100, 0);
-										CombatSounds
-												.getNpcAttackSounds(NpcHandler.npcs[i].npcType),
-										100, 0);
 					}
 					if (special) {
 						loadSpell2(i);
@@ -202,14 +200,11 @@ public class NpcCombat {
 					if (NpcHandler.multiAttacks(i)) {
 						multiAttackGfx(i, NpcHandler.npcs[i].projectileId);
 						NpcData.startAnimation(NpcEmotes.getAttackEmote(i), i);
-						if (CombatConstants.COMBAT_SOUNDS
+						if (CombatConstants.COMBAT_SOUNDS) {
-								&& NpcHandler.npcs[i].npcType < 3177
+							if (PestControl.npcIsPCMonster(NpcHandler.npcs[i].npcType) || PestControl.isPCPortal(NpcHandler.npcs[i].npcType)) {
-								&& NpcHandler.npcs[i].npcType > 3180) {
+								return;
-							c.getPacketSender()
+							}
-									.sendSound(
+							c.getPacketSender().sendSound(CombatSounds.getNpcAttackSounds(NpcHandler.npcs[i].npcType), 100, 0);
-											CombatSounds
-													.getNpcAttackSounds(NpcHandler.npcs[i].npcType),
-											100, 0);
 						}
 						NpcHandler.npcs[i].oldIndex = c.playerId;
 						return;
@@ -242,11 +237,10 @@ public class NpcCombat {
 					NpcHandler.npcs[i].oldIndex = c.playerId;
 					NpcData.startAnimation(NpcEmotes.getAttackEmote(i), i);
 					if (CombatConstants.COMBAT_SOUNDS) {
-						c.getPacketSender()
+						if (PestControl.npcIsPCMonster(NpcHandler.npcs[i].npcType) || PestControl.isPCPortal(NpcHandler.npcs[i].npcType)) {
-								.sendSound(
+							return;
-										CombatSounds
+						}
-												.getNpcAttackSounds(NpcHandler.npcs[i].npcType),
+						c.getPacketSender().sendSound(CombatSounds.getNpcAttackSounds(NpcHandler.npcs[i].npcType), 100, 0);
-										100, 0);
 					}
 					c.getPacketSender().closeAllWindows();
 				}

2006Redone Server/src/com/rebotted/game/content/combat/range/DwarfCannon.java

@@ -5,14 +5,10 @@ import com.rebotted.event.CycleEvent;
 import com.rebotted.event.CycleEventContainer;
 import com.rebotted.event.CycleEventHandler;
 import com.rebotted.game.content.combat.CombatConstants;
-import com.rebotted.game.content.skills.fletching.LogCuttingInterface;
-import com.rebotted.game.items.ItemAssistant;
 import com.rebotted.game.npcs.Npc;
 import com.rebotted.game.npcs.NpcHandler;
 import com.rebotted.game.objects.Objects;
-import com.rebotted.game.players.Client;
 import com.rebotted.game.players.Player;
-import com.rebotted.game.players.PlayerHandler;
 import com.rebotted.util.Misc;
 import com.rebotted.world.clip.Region;
 
@@ -37,8 +33,6 @@ public class DwarfCannon {
 
 	public final int steelBarID = 2353;
 
-	private final int ammoMouldID = 4;
-
 	public boolean settingUp = false;
 	
 	private int setUpStage = 0;

2006Redone Server/src/com/rebotted/game/content/combat/range/RangeData.java

@@ -7,7 +7,7 @@ public class RangeData {
 	public final static int[] BOWS = { 9185, 839, 845, 847, 851, 855, 859, 841,
 			843, 849, 853, 857, 861, 4212, 4214, 4215, 11235, 4216, 4217, 4218,
 			4219, 4220, 4221, 4222, 4223, 6724, 4734, 4934, 4935, 4936, 4937 };
-	public final static int[] ARROWS = { 882, 884, 886, 888, 890, 892, 4740,
+	public final static int[] ARROWS = { 882, 883, 884, 885, 886, 887, 888, 889, 890, 891, 892, 893, 4740,
 			11212, 9140, 9141, 4142, 9143, 9144, 9240, 9241, 9242, 9243, 9244,
 			9245, 4150, 4160, 4172 };
 	public final static int[] NO_ARROW_DROP = { 4212, 4214, 4215, 4216, 4217,
@@ -50,10 +50,8 @@ public class RangeData {
 		case 3202:
 		case 3204:
 			return true;
-
-		default:
-			return false;
 		}
+		return false;
 	}
 
 	public static int correctBowAndArrows(Player c) {

2006Redone Server/src/com/rebotted/game/content/minigames/Dueling.java

@@ -1,7 +1,6 @@
 package com.rebotted.game.content.minigames;
 
 import java.util.concurrent.CopyOnWriteArrayList;
-
 import com.rebotted.GameConstants;
 import com.rebotted.GameEngine;
 import com.rebotted.game.content.combat.prayer.PrayerDrain;
@@ -17,8 +16,6 @@ import com.rebotted.game.players.PlayerSave;
 import com.rebotted.util.GameLogger;
 import com.rebotted.util.Misc;
 
-import static com.rebotted.game.content.music.sound.SoundList.DUEL_WON;
-
 public class Dueling {
 
 	private final Player player;
@@ -406,7 +403,9 @@ public class Dueling {
 
 	public void confirmDuel() {
 		Client o = (Client) PlayerHandler.players[player.duelingWith];
-		if (o == null) {
+		if (o == null || ((o.getDueling().stakedItems.size() + o.getDueling().otherStakedItems.size()) > player.getItemAssistant().freeSlots())) {
+			player.getPacketSender().sendMessage("Not enough inventory spaces.");
+			o.getPacketSender().sendMessage("Not enough inventory spaces.");
 			declineDuel();
 			return;
 		}
@@ -573,7 +572,7 @@ public class Dueling {
 		player.getPlayerAssistant().requestUpdates();
 	}
 
-	public static void HandleForfeit(Player player)
+	public static void handleForfeit(Player player)
 	{
 		Client opponent = (Client) PlayerHandler.players[player.duelingWith];
 		opponent.getDueling().duelVictory();
@@ -703,8 +702,10 @@ public class Dueling {
 		}
 		player.getPacketSender().closeAllWindows();
 		player.duelStatus = 0;
+		o.duelStatus = 0;
 		player.openDuel = false;
 		o.openDuel = false;
+
 		player.duelingWith = 0;
 		player.duelSpaceReq = 0;
 		player.duelRequested = false;

2006Redone Server/src/com/rebotted/game/content/minigames/PestControl.java

@@ -52,6 +52,7 @@ public class PestControl {
 	public int ravager = 3742 + Misc.random(4);
 	public int torcher = 3752 + Misc.random(7);
 	public int splater = 3727 + Misc.random(4);
+	
 
 	private final int[][] pcNPCData = { { 3777, 2628, 2591 }, // portal
 			{ 3778, 2680, 2588 }, // portal
@@ -150,40 +151,6 @@ public class PestControl {
 		}
 	}
 
-	/*
-	 * private void setBoatInterface() { try { for (Client c :
-	 * waitingBoat.keySet()) { if (c != null) { try { if (gameStarted) {
-	 * c.getPlayerAssistant().sendString("Next Departure: " + (waitTimer +
-	 * gameTimer)/60 + " minutes", 21120); } else {
-	 * c.getPlayerAssistant().sendString("Next Departure: " + waitTimer + "",
-	 * 21120); } c.getPlayerAssistant().sendString("Players Ready: " +
-	 * playersInBoat() + "", 21121); c.getPlayerAssistant().sendString("(Need "
-	 * + PLAYERS_REQUIRED + " to 25 players)", 21122);
-	 * c.getPlayerAssistant().sendString("Points: " + c.pcPoints + "", 21123);
-	 * switch (waitTimer) { case 60: c.getPacketDispatcher
-	 * ().sendMessage("Next game will start in: 60 seconds."); break; case 30:
-	 * c.
-	 * getPacketDispatcher().sendMessage("Next game will start in: 30 seconds."
-	 * ); break; } } catch (RuntimeException e) { // TODO Auto-generated catch
-	 * block e.printStackTrace(); } } } } catch (RuntimeException e) {
-	 * System.out.println("Failed to set interfaces"); e.printStackTrace(); } }
-	 */
-
-	/*
-	 * private void setGameInterface() { for (Client player :
-	 * gamePlayers.keySet()) { if (player != null) { for (int i = 0; i <
-	 * portalHealth.length; i++) { if (portalHealth[i] > 0) {
-	 * player.getPlayerAssistant().sendString("" + portalHealth[i] + "", 21111 +
-	 * i); } else player.getPlayerAssistant().sendString("Dead", 21111 + i); }
-	 * player.getPlayerAssistant().sendString("" + KNIGHTS_HEALTH, 21115);
-	 * player.getPlayerAssistant().sendString("" + player.pcDamage, 21116); if
-	 * (gameTimer > 60) {
-	 * player.getPlayerAssistant().sendString("Time remaining: " +
-	 * (gameTimer/60) + " minutes", 21117); } else {
-	 * player.getPlayerAssistant().sendString("Time remaining: " + gameTimer +
-	 * " seconds", 21117); } } } }
-	 */
-
 	/***
 	 * Moving players to arena if there's enough players
 	 */
@@ -208,10 +175,10 @@ public class PestControl {
 			}
 			player.getPlayerAssistant().movePlayer(2656 + Misc.random3(3), 2614 - Misc.random3(4), 0);
 			player.getDialogueHandler().sendDialogues(599, 3790);
-			player.getPacketSender().sendMessage("The Pest Control Game has begun!");
+			player.getPacketSender().sendMessage("The Pest Control game has begun!");
+			player.npcCanAttack = true;
 			gamePlayers.put(player, team);
 		}
-
 		waitingBoat.clear();
 	}
 
@@ -322,14 +289,12 @@ public class PestControl {
 			player.poisonDamage = 0;
 			PrayerDrain.resetPrayers(player);
 			for (int i = 0; i < 24; i++) {
-				player.playerLevel[i] = player.getPlayerAssistant()
+				player.playerLevel[i] = player.getPlayerAssistant().getLevelForXP(player.playerXP[i]);
-						.getLevelForXP(player.playerXP[i]);
 				player.getPlayerAssistant().refreshSkill(i);
 			}
 			player.specAmount = 10;
 			player.pcDamage = 0;
-			player.getItemAssistant().addSpecialBar(
+			player.getItemAssistant().addSpecialBar(player.playerEquipment[player.playerWeapon]);
-					player.playerEquipment[player.playerWeapon]);
 		}
 	}
 
@@ -425,7 +390,11 @@ public class PestControl {
 	}
 
 	public static boolean npcIsPCMonster(int npcType) {
-		return npcType >= 3727 && npcType <= 3776;
+		return (npcType >= 3727 && npcType <= 3776);
+	}
+	
+	public static boolean isPCPortal(int npcType) {
+		return (npcType >= 3777 && npcType <= 3780);
 	}
 
 	private void spawnNPC() {
@@ -434,8 +403,8 @@ public class PestControl {
 			GameEngine.npcHandler.spawnNpc2(aPcNPCData[0], aPcNPCData[1], aPcNPCData[2], 0, 0, 200, 0, 0, playersInGame() * 200, false);
 		}
 		for (int[] voidMonsters : voidMonsterData) {
-			//Server.npcHandler.spawnNpc2(voidMonsters[0], voidMonsters[1], voidMonsters[2], 0, 1, voidMonsters[NpcHandler.getNpcListHP(voidMonsters[0])], NpcHandler.getNpcListCombat(voidMonsters[0])/10, NpcHandler.getNpcListCombat(voidMonsters[0]), playersInGame() * 200);
+			//GameEngine.npcHandler.spawnNpc2(voidMonsters[0], voidMonsters[1], voidMonsters[2], 0, 1, voidMonsters[NpcHandler.getNpcListHP(voidMonsters[0])], NpcHandler.getNpcListCombat(voidMonsters[0])/10, NpcHandler.getNpcListCombat(voidMonsters[0]), playersInGame() * 200);
-			GameEngine.npcHandler.spawnNpc2(voidMonsters[0], voidMonsters[1], voidMonsters[2], 0, 1, 500, 20, 200, 25, false);
+			GameEngine.npcHandler.spawnNpc2(voidMonsters[0], voidMonsters[1], voidMonsters[2], 0, 1, 50, 20, 75, 50, true);
 		}
 	}
 }

2006Redone Server/src/com/rebotted/game/content/quests/impl/BlackKnightsFortress.java

@@ -13,10 +13,10 @@ public class BlackKnightsFortress {
             client.getPacketSender().sendFrame126("I can start this quest by speaking to Sir Amik Varze in", 8147);
             client.getPacketSender().sendFrame126("Falador Castle.", 8148);
             client.getPacketSender().sendFrame126("", 8149);
-            client.getPacketSender().sendFrame126("QUEST REQUIREMENTS:", 8150);
+            client.getPacketSender().sendFrame126("Quest Requirements:", 8150);
             client.getPacketSender().sendFrame126("12 Quest Points", 8151);
         } else if (client.blackKnight == 1) {
-            client.getPacketSender().sendFrame126("@str@I've Talked with Sir Amik Varze", 8147);
+            client.getPacketSender().sendFrame126("@str@I've talked with Sir Amik Varze", 8147);
             client.getPacketSender().sendFrame126("He wants me to kill 30 Black Knights and", 8148);
             client.getPacketSender().sendFrame126("collect their notes.", 8149);
             client.getPacketSender().sendFrame126("", 8150);

2006Redone Server/src/com/rebotted/game/content/quests/impl/PiratesTreasure.java

@@ -24,7 +24,7 @@ public class PiratesTreasure {
 			client.getPacketSender().sendFrame126("Port Sarim", 8148);
 			client.getPacketSender().sendFrame126("", 8149);
 			client.getPacketSender().sendFrame126(
-					"There are no minimum requirments.", 8150);
+					"There are no minimum requirements.", 8150);
 		} else if (client.pirateTreasure == 1) {
 			client.getPacketSender().sendFrame126("Pirate's Treasure", 8144);
 			client.getPacketSender().sendFrame126(

2006Redone Server/src/com/rebotted/game/content/skills/thieving/Stalls.java

@@ -10,7 +10,6 @@ import com.rebotted.game.content.skills.SkillHandler;
 import com.rebotted.game.items.ItemAssistant;
 import com.rebotted.game.items.ItemList;
 import com.rebotted.game.npcs.NpcHandler;
-import com.rebotted.game.objects.Object;
 import com.rebotted.game.players.Player;
 import com.rebotted.util.Misc;
 
@@ -18,30 +17,30 @@ public class Stalls {
 
 
 	public static enum stallData {
-		VEGETABLE_STALL(4706, 2, 10, 0, new int[] { 1965, 1 }), 
+		VEGETABLE_STALL(4706, 2, 10, 0, new int[] { 1965, 1 }),
-		BAKER_STALL(2561, 5, 16, 3, new int[] { 2309, 1 }, new int[] { 1891, 1 }, new int[] { 1895, 1 }), 
+		BAKER_STALL(2561, 5, 16, 3, new int[] { 2309, 1 }, new int[] { 1891, 1 }, new int[] { 1895, 1 }),
-		TEA_STALL(635, 5, 16, 0, new int[] {712, 1 }), 
+		TEA_STALL(635, 5, 16, 0, new int[] {712, 1 }),
-		SILK_STALL(2560, 20, 24, 2, new int[] { 950, 1 }), 
+		SILK_STALL(2560, 20, 24, 2, new int[] { 950, 1 }),
-		WINE_STALL(14011, 22, 27, 0, new int[] { 1935, 1 }, new int[] {i("jug of water"), 1 }, new int[] { i("jug of wine"), 1 }, 
+		WINE_STALL(14011, 22, 27, 0, new int[] { 1935, 1 }, new int[] {i("jug of water"), 1 }, new int[] { i("jug of wine"), 1 },
-		new int[] { i("grapes"), 1 }), SEED_STALL(7053, 27, 10, 0, new int[] { i("potato seed"), 1 }, new int[] {i("onion seed"), 1 },
+				new int[] { i("grapes"), 1 }), SEED_STALL(7053, 27, 10, 0, new int[] { i("potato seed"), 1 }, new int[] {i("onion seed"), 1 },
-		new int[] { i("cabbage seed"), 1 }, new int[] {i("tomato seed"), 1 }, new int[] { i("sweetcorn seed"), 1 }, new int[] { i("strawberry seed"), 1 }, 
+				new int[] { i("cabbage seed"), 1 }, new int[] {i("tomato seed"), 1 }, new int[] { i("sweetcorn seed"), 1 }, new int[] { i("strawberry seed"), 1 },
-		new int[] {i("watermelon seed"), 1 }, new int[] {i("barley seed"), 1 }, new int[] { i("jute seed"), 1 }, new int[] { i("marigold seed"), 1 }, 
+				new int[] {i("watermelon seed"), 1 }, new int[] {i("barley seed"), 1 }, new int[] { i("jute seed"), 1 }, new int[] { i("marigold seed"), 1 },
-		new int[] {i("rosemary seed"), 1 }, new int[] {i("hammerstone seed"), 1 }, new int[] {i("asgarnain seed"), 1 }, new int[] {i("yanillian seed"), 1 }, 
+				new int[] {i("rosemary seed"), 1 }, new int[] {i("hammerstone seed"), 1 }, new int[] {i("asgarnain seed"), 1 }, new int[] {i("yanillian seed"), 1 },
-		new int[] {i("krandorian seed"), 1 }, new int[] {i("wildblood seed"), 1 }), FUR_STALL(2563, 35, 36, 0, new int[] { 6814, 1 }, new int[] { 958, 1 }), 
+				new int[] {i("krandorian seed"), 1 }, new int[] {i("wildblood seed"), 1 }), FUR_STALL(2563, 35, 36, 0, new int[] { 6814, 1 }, new int[] { 958, 1 }),
-		FUR_STALL2(4278, 35, 36, 0, new int[] { 6814, 1 }, new int[] { 958, 1 }), 
+		FUR_STALL2(4278, 35, 36, 0, new int[] { 6814, 1 }, new int[] { 958, 1 }),
-		FISH_STALL(4705, 42, 42, 0, new int[] { 359, 1 }), 
+		FISH_STALL(4705, 42, 42, 0, new int[] { 359, 1 }),
-		FISH_STALL2(4277, 42, 42, 0, new int[] { 359, 1 }), 
+		FISH_STALL2(4277, 42, 42, 0, new int[] { 359, 1 }),
-		SILVER_STALL(2565, 50, 54, 2, new int[] { 442, 1 }, new int[] { 2355, 1 }), 
+		SILVER_STALL(2565, 50, 54, 2, new int[] { 442, 1 }, new int[] { 2355, 1 }),
 		SPICE_STALL(2564, 65, 81.3, 0, new int[] { 2007, 1 }, new int[] { 946, 1 }, new int[] { 1550, 1 }), GEM_STALL(2562, 75, 160, 3,
-		new int[] { 1617, 1 }, new int[] { 1619, 1 }, new int[] { 1621, 1 }, new int[] { 1623, 1 }),
+				new int[] { 1617, 1 }, new int[] { 1619, 1 }, new int[] { 1621, 1 }, new int[] { 1623, 1 }),
 		MAGIC_STALL(4877, 65, 100, 0, new int[] {i("air rune"), 1}, new int[] {i("water rune"), 1}, new int[] {i("fire rune"), 1}, new int[] {i("law rune"), 1}),
 		SCIMITAR_STALL(4878, 65, 100, 0, new int[] {i("iron scimitar"), 1}, new int[] {i("steel scimitar"), 1});
-		
+
 		private int objectId, levelReq, face;
 		private int[][] stalls;
 		private double xp;
 		private long respawnTime;
-		
+
 		private stallData(final int objectId, final int levelReq, final double xp, final int face, final int[]... stalls) {
 			this.objectId = objectId;
 			this.levelReq = levelReq;
@@ -72,7 +71,7 @@ public class Stalls {
 		}
 
 	}
-	
+
 	public static int r(int random) {
 		return Misc.random(random);
 	}
@@ -121,8 +120,13 @@ public class Stalls {
 			if(objectId == s.getObject()) {
 				// Wait for respawn
 				if (System.currentTimeMillis() < s.respawnTime) {
-					p.getPacketSender().sendMessage("You need to wait longer before you can thieve this stall!");
+					long timeFirstStealFromStall = s.respawnTime - (GameConstants.CYCLE_TIME * getRespawnTime(s.objectId));
-					return;
+
+					// If stealing from stall at the same tick as another player
+					if(p.hasThievedStall() || System.currentTimeMillis() - timeFirstStealFromStall >= GameConstants.CYCLE_TIME) {
+						p.getPacketSender().sendMessage("You need to wait longer before you can thieve this stall!");
+						return;
+					}
 				}
 				// Thieving level too low
 				if (p.playerLevel[p.playerThieving] < s.getLevel()) {
@@ -144,11 +148,13 @@ public class Stalls {
 				s.respawnTime = System.currentTimeMillis() + (respawnTime * GameConstants.CYCLE_TIME);
 				p.getPacketSender().sendMessage("You steal a " + ItemAssistant.getItemName(random[0]) + " from the stall.");
 				p.getItemAssistant().addItem(random[0], random[1]);
+				p.setHasThievedStall(true);
 				CycleEventHandler.getSingleton().addEvent(p, new CycleEvent() {
 					@Override
 					public void execute(CycleEventContainer container) {
 						GameEngine.objectHandler.createAnObject(p, s.getObject(), x, y, s.getFace());
 						//new Object(objectId, x, y, 0, s.getFace(), 10, j, getRespawnTime(objectId));
+						p.setHasThievedStall(false);
 						container.stop();
 					}
 					@Override
@@ -194,7 +200,7 @@ public class Stalls {
 			if (NpcHandler.npcs[i] != null) {
 				if (NpcHandler.npcs[i].npcType == 32 || NpcHandler.npcs[i].npcType == 1317 || NpcHandler.npcs[i].npcType == 2236 || NpcHandler.npcs[i].npcType == 2571) {
 					if (p.goodDistance(p.absX, p.absY, NpcHandler.npcs[i].absX, NpcHandler.npcs[i].absY, 7)
-						&& p.heightLevel == NpcHandler.npcs[i].heightLevel) {
+							&& p.heightLevel == NpcHandler.npcs[i].heightLevel) {
 						if (!NpcHandler.npcs[i].underAttack) {
 							NpcHandler.npcs[i].forceChat("What do you think you're doing?!?");
 							NpcHandler.npcs[i].underAttack = true;

2006Redone Server/src/com/rebotted/game/dialogues/DialogueHandler.java

@@ -520,7 +520,7 @@ public class DialogueHandler {
 				player.getItemAssistant().deleteItem(436, 4);
 				player.getItemAssistant().deleteItem(440, 2);
 				player.doricQuest = 2;
-				sendNpcChat2("You brought me everything i need.", "Thank You!",
+				sendNpcChat2("You brought me everything I need.", "Thank You!",
 						player.talkingNpc, "Doric");
 				player.nextChat = 87;
 				break;
@@ -1008,7 +1008,7 @@ public class DialogueHandler {
 				break;
 			case 215:
 				sendNpcChat3(
-						"I need time to study this, " + player.playerName + ".",
+						"I need time to study this, " + Misc.capitalize(player.playerName) + ".",
 						"Can you please do me this task while I study this talisman you have brought me?",
 						"In the mighty town of Varrock, which", player.talkingNpc,
 						"Sedridor");
@@ -1046,7 +1046,7 @@ public class DialogueHandler {
 				player.nextChat = 220;
 				break;
 			case 220:
-				sendNpcChat2("Do this thing for me " + player.playerName + ".",
+				sendNpcChat2("Do this thing for me " + Misc.capitalize(player.playerName) + ".",
 						" Be rewarded in a way you can never imagine.",
 						player.talkingNpc, "Sedridor");
 				player.nextChat = 222;
@@ -1152,7 +1152,7 @@ public class DialogueHandler {
 				player.nextChat = 239;
 				break;
 			case 239:
-				sendNpcChat2("Ah, " + player.playerName + ". How goes your quest?",
+				sendNpcChat2("Ah, " + Misc.capitalize(player.playerName) + ". How goes your quest?",
 						"Have you delivered the research notes to my friend yet?",
 						player.talkingNpc, "Sedridor");
 				player.nextChat = 240;
@@ -3046,7 +3046,7 @@ public class DialogueHandler {
 				break;
 
 			case 590:
-				sendNpcChat1("Hello " + player.playerName + ".", player.talkingNpc,
+				sendNpcChat1("Hello " + Misc.capitalize(player.playerName) + ".", player.talkingNpc,
 						"Gnome Pilot");
 				player.nextChat = 591;
 				break;
@@ -4285,7 +4285,7 @@ public class DialogueHandler {
 				break;
 			case 1237:
 				sendNpcChat2("You have been assigned " + player.taskAmount + " " + player.getSlayer().getTaskName(player.slayerTask) + ",",
-						"Good luck " + player.playerName + ".",
+						"Good luck " + Misc.capitalize(player.playerName) + ".",
 						player.talkingNpc,
 						NpcHandler.getNpcListName(player.talkingNpc));
 				player.nextChat = 0;
@@ -4440,7 +4440,7 @@ public class DialogueHandler {
 			case 1318:
 				if (player.getSlayer().hasTask()) {
 					sendNpcChat3(
-							"Hello " + player.playerName + ".",
+							"Hello " + Misc.capitalize(player.playerName) + ".",
 							"You currently need to kill "
 									+ player.taskAmount
 									+ " more "
@@ -4476,7 +4476,7 @@ public class DialogueHandler {
 			case 1320:
 				if (player.getSlayer().hasTask()) {
 					sendNpcChat2(
-							"Hello " + player.playerName + ".",
+							"Hello " + Misc.capitalize(player.playerName) + ".",
 							"I am located in "
 									+ player.getSlayer().getMasterLocation(
 									player.SlayerMaster) + ".",
@@ -4495,7 +4495,7 @@ public class DialogueHandler {
 				break;
 
 			case 1322:
-				sendNpcChat2("Hello " + player.playerName + ".", "Are you interested in buying anything?", player.talkingNpc, NpcHandler.getNpcListName(player.talkingNpc));
+				sendNpcChat2("Hello " + Misc.capitalize(player.playerName) + ".", "Are you interested in buying anything?", player.talkingNpc, NpcHandler.getNpcListName(player.talkingNpc));
 				player.nextChat = 1323;
 				break;
 
@@ -4527,7 +4527,7 @@ public class DialogueHandler {
 				break;
 
 			case 1329:
-				sendNpcChat2("Hello " + player.playerName + ".",
+				sendNpcChat2("Hello " + Misc.capitalize(player.playerName) + ".",
 						"Are you interested in buying anything?",
 						player.talkingNpc,
 						NpcHandler.getNpcListName(player.talkingNpc));
@@ -4856,7 +4856,7 @@ public class DialogueHandler {
 			case 1368:
 				sendNpcChat2("You have been assigned " + player.taskAmount + " "
 								+ player.getSlayer().getTaskName(player.slayerTask) + ",",
-						"Good luck " + player.playerName + ".", player.talkingNpc,
+						"Good luck " + Misc.capitalize(player.playerName) + ".", player.talkingNpc,
 						NpcHandler.getNpcListName(player.talkingNpc));
 				player.nextChat = 0;
 				break;
@@ -4895,7 +4895,7 @@ public class DialogueHandler {
 				break;
 
 			case 1373:
-				sendNpcChat2("Hello " + player.playerName + ".",
+				sendNpcChat2("Hello " + Misc.capitalize(player.playerName) + ".",
 						"Are you interested in buying anything?",
 						player.talkingNpc,
 						NpcHandler.getNpcListName(player.talkingNpc));
@@ -4928,7 +4928,7 @@ public class DialogueHandler {
 				break;
 
 			case 1378:
-				sendNpcChat2("Hello " + player.playerName + ".",
+				sendNpcChat2("Hello " + Misc.capitalize(player.playerName) + ".",
 						"Are you interested in buying a candle for 1k?",
 						player.talkingNpc, "Candle Seller");
 				player.nextChat = 1379;
@@ -6123,7 +6123,7 @@ public class DialogueHandler {
 				break;
 
 			case 3118:
-				sendNpcChat2("Hello " + player.playerName + ".",
+				sendNpcChat2("Hello " + Misc.capitalize(player.playerName) + ".",
 						"Are you interested in buying any beer?",
 						player.talkingNpc,
 						NpcHandler.getNpcListName(player.talkingNpc));
@@ -6383,7 +6383,7 @@ public class DialogueHandler {
 				break;
 
 			case 3158:
-				sendNpcChat1("Hello, " + player.playerName + " what would you like to do?", player.talkingNpc, "Wyson the Gardener");
+				sendNpcChat1("Hello, " + Misc.capitalize(player.playerName) + " what would you like to do?", player.talkingNpc, "Wyson the Gardener");
 				player.nextChat = 3159;
 				break;
 
@@ -6733,29 +6733,8 @@ public class DialogueHandler {
 				player.dialogueAction = 3205;//187
 				break;
 
-			/*case 3206:
-			if (Constants.HALLOWEEN == false) {
-				sendNpcChat2("The halloween event is now over,", "what would you like?", 945, "" + Constants.SERVER_NAME + " Guide");
-				client.nextChat = 3207;
-			} else if (client.recievedMask == false && Constants.HALLOWEEN) {
-				sendNpcChat2("Thank you so much for voting!", "Enjoy your mask!", 945, "" + Constants.SERVER_NAME + " Guide");
-				client.getItemAssistant().addOrDropItem(client.getPlayerAssistant().randomReward(), 1);
-				VotingHandler.setAsReceived(client.playerName);
-				client.recievedMask = true;
-				client.nextChat = 0;
-			} else if (client.recievedMask && Constants.HALLOWEEN) {
-				sendNpcChat2("You have already recieved a halloween mask.", "What reward would you like?", 945, "" + Constants.SERVER_NAME + " Guide");
-				client.nextChat = 3207;
-			}
-			break;
-
-			case 3207:
-				sendOption3("Experience Lamp (Depends on Level of Skill)", "Coins (1-4k)", "Energy Lamp");
-				client.dialogueAction = 188;
-			break;*/
-
 			case 3208:
-				sendNpcChat1("Hello, " + player.playerName + " what would you like to do?", 958, "Fadli");
+				sendNpcChat1("Hello, " + Misc.capitalize(player.playerName) + " what would you like to do?", 958, "Fadli");
 				player.nextChat = 3209;
 				break;
 
@@ -6824,7 +6803,7 @@ public class DialogueHandler {
 				break;
 
 			case 3221://28
-				sendStatement("Congratulations, " + player.playerName + ". You've completed the barrows challenge & your reward has been delivered.");
+				sendStatement("Congratulations, " + Misc.capitalize(player.playerName) + ". You've completed the barrows challenge & your reward has been delivered.");
 				player.nextChat = 0;
 				break;
 
@@ -6919,7 +6898,7 @@ public class DialogueHandler {
 				player.nextChat = 3509;
 				break;
 			case 3509:
-				sendNpcChat1("Thank you so much " + player.playerName + "!", player.talkingNpc, "Sir Amik Varze");
+				sendNpcChat1("Thank you so much " + Misc.capitalize(player.playerName) + "!", player.talkingNpc, "Sir Amik Varze");
 				player.nextChat = 0;
 				break;
 			case 3510:
@@ -6933,7 +6912,7 @@ public class DialogueHandler {
 				}
 				break;
 			case 3511:
-				sendNpcChat1("Thank you very much " + player.playerName + "!",
+				sendNpcChat1("Thank you very much " + Misc.capitalize(player.playerName) + "!",
 						player.talkingNpc, "Sir Amik Varze");
 				player.nextChat = 3512;
 				break;

2006Redone Server/src/com/rebotted/game/items/Weight.java

@@ -8,62 +8,62 @@ import com.rebotted.game.players.Player;
  */
 public class Weight extends ItemDefinitions {
 
-	/**
+    /**
-	 * Calculates the weight when doing actions
+     * Calculates the weight when doing actions
-	 * 
+     *
-	 * @param c
+     * @param c
-	 * @param item
+     * @param item
-	 * @param action
+     * @param action
-	 *            - deleteitem, additem, equip, unequip.
+     *            - deleteitem, additem, equip, unequip.
-	 */
+     */
-	private static void calcWeight(Player c, int item, String action) {
+    public static void calcWeight(Player c, int item, String action) {
-		if (action.equalsIgnoreCase("deleteitem")) {
+        if (action.equalsIgnoreCase("deleteitem")) {
-			if (getWeight(item) > 99.20) {
+            if (getWeight(item) > 99.20) {
-				c.weight -= getWeight(item) / 100;
+                c.weight -= getWeight(item) / 100;
-				if (c.weight < 0) {
+                if (c.weight < 0) {
-					c.weight = 0.0;
+                    c.weight = 0.0;
-				}
+                }
-				c.getPacketSender().writeWeight((int) c.weight);
+                c.getPacketSender().writeWeight((int) c.weight);
-				return;
+                return;
-			}
+            }
-			c.weight -= getWeight(item) / 10;
+            c.weight -= getWeight(item) / 10;
-			if (c.weight < 0) {
+            if (c.weight < 0) {
-				c.weight = 0.0;
+                c.weight = 0.0;
-			}
+            }
-			c.getPacketSender().writeWeight((int) c.weight);
+            c.getPacketSender().writeWeight((int) c.weight);
-		} else if (action.equalsIgnoreCase("additem")) {
+        } else if (action.equalsIgnoreCase("additem")) {
-			if (getWeight(item) > 99.20) {
+            if (getWeight(item) > 99.20) {
-				c.weight += getWeight(item) / 100;
+                c.weight += getWeight(item) / 100;
-				c.getPacketSender().writeWeight((int) c.weight);
+                c.getPacketSender().writeWeight((int) c.weight);
-				return;
+                return;
-			}
+            }
-			c.weight += getWeight(item) / 10;
+            c.weight += getWeight(item) / 10;
-			c.getPacketSender().writeWeight((int) c.weight);
+            c.getPacketSender().writeWeight((int) c.weight);
-		}
+        }
-	}
+    }
 
-	/**
+    /**
-	 * Updates the weight for inventory and equipment.
+     * Updates the weight for inventory and equipment.
-	 * 
+     *
-	 * @param player
+     * @param player
-	 */
+     */
-	public static void updateWeight(Player player) {
+    public static void updateWeight(Player player) {
-		if (player != null) {
+        if (player != null) {
-			player.weight = 0;
+            player.weight = 0;
-			// Inventory items
+            // Inventory items
-			for (int playerItem : player.playerItems) {
+            for (int playerItem : player.playerItems) {
-				if (playerItem > -1) {// inventory
+                if (playerItem > -1) {// inventory
-					calcWeight(player, playerItem, "addItem");
+                    calcWeight(player, playerItem, "addItem");
-				}
+                }
-			}
+            }
-			// Equiped items
+            // Equiped items
-			for (int element : player.playerEquipment) {
+            for (int element : player.playerEquipment) {
-				if (element > -1) {// equipment
+                if (element > -1) {// equipment
-					if (element == 88) player.weight -= 4.5;
+                    if (element == 88) player.weight -= 4.5;
-					else calcWeight(player, element, "addItem");
+                    else calcWeight(player, element, "addItem");
-				}
+                }
-			}
+            }
-			player.getPacketSender().writeWeight((int) player.weight);
+        }
-		}
+        player.getPacketSender().writeWeight((int) player.weight);
-	}
+    }
 }

2006Redone Server/src/com/rebotted/game/npcs/NpcHandler.java

@@ -4,7 +4,6 @@ import java.io.BufferedReader;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
-
 import com.rebotted.GameConstants;
 import com.rebotted.GameEngine;
 import com.rebotted.event.CycleEvent;
@@ -650,12 +649,14 @@ public class NpcHandler {
 					if (npcs[i].actionTimer == 0 && npcs[i].applyDead == false && npcs[i].needRespawn == false) {
 						npcs[i].updateRequired = true;
 						npcs[i].facePlayer(0);
-						if (npcs[i].killedBy <= 0)
+						npcs[i].killedBy = NpcData.getNpcKillerId(i);
-							npcs[i].killedBy = NpcData.getNpcKillerId(i);
 						Player c = (Client) PlayerHandler.players[npcs[i].killedBy];
 						if (c != null) {
 							npcs[i].animNumber = NpcEmotes.getDeadEmote(c, i); // dead emote
 							if (CombatConstants.COMBAT_SOUNDS) {
+								if (PestControl.npcIsPCMonster(NpcHandler.npcs[i].npcType) || PestControl.isPCPortal(NpcHandler.npcs[i].npcType)) {
+									return;
+								}
 								c.getPacketSender().sendSound(CombatSounds.getNpcDeathSounds(npcs[i].npcType), 100, 0);
 							}
 						}

2006Redone Server/src/com/rebotted/game/npcs/drops/NPCDrops.java

@@ -2012,10 +2012,10 @@ public class NPCDrops extends NPCDropsHandler {
 
 	public static final ItemDrop[] imp = {
 			new ItemDrop(i("ashes"), 1, ALWAYS),
-			new ItemDrop(i("red bead"), 1, UNCOMMON),
+			new ItemDrop(i("red bead"), 1, COMMON),
-			new ItemDrop(i("yellow bead"), 1, UNCOMMON),
+			new ItemDrop(i("yellow bead"), 1, COMMON),
-			new ItemDrop(i("black bead"), 1, UNCOMMON),
+			new ItemDrop(i("black bead"), 1, COMMON),
-			new ItemDrop(i("white bead"), 1, UNCOMMON),
+			new ItemDrop(i("white bead"), 1, COMMON),
 			new ItemDrop(i("tinderbox"), 1, UNCOMMON),
 			new ItemDrop(i("ball of wool"), 1, COMMON),
 			new ItemDrop(i("hammer"), 1, COMMON),

2006Redone Server/src/com/rebotted/game/objects/ObjectsActions.java

@@ -1462,7 +1462,7 @@ public class ObjectsActions {
 			break;
 
 		case 14315:
-			if (!PestControl.waitingBoat.containsKey(player) && player.absX == 2657 && player.absY > 2638 && player.absY < 264) {
+			if (!PestControl.waitingBoat.containsKey(player) && player.absX == 2657 && player.absY > 2638 && player.absY < 2640) {
 				PestControl.addToWaitRoom(player);
 			} else {
 				if (player.absX == 2657 && player.absY > 2638 && player.absY < 2641) {
@@ -1691,7 +1691,7 @@ public class ObjectsActions {
 			RuneCraftingActions.handleRuneCrafting(player, objectType);
 			break;
 		case 3203:
-			Dueling.HandleForfeit(player);
+			Dueling.handleForfeit(player);
 			break;
 		case 6481:
 				player.getPlayerAssistant().movePlayer(3233, 9317, 0);

2006Redone Server/src/com/rebotted/game/players/Player.java

@@ -75,7 +75,7 @@ import com.rebotted.util.Stream;
 import com.rebotted.world.ObjectManager;
 
 public abstract class Player {
-	
+
 	public byte buffer[] = null;
 	public Stream inStream = null, outStream = null;
     public IoSession session;
@@ -135,11 +135,11 @@ public abstract class Player {
 	public SingleGates getSingleGates() {
 		return singleGates;
 	}
-	
+
 	public DoubleGates getDoubleGates() {
 		return doubleGates;
 	}
-	
+
 	public GateHandler getGateHandler() {
 		return gateHandler;
 	}
@@ -155,19 +155,19 @@ public abstract class Player {
 	public Mining getMining() {
 		return mining;
 	}
-	
+
 	public Barrows getBarrows() {
 		return barrows;
 	}
-	
+
     public GlassBlowing getGlassBlowing() {
         return glassBlowing;
     }
-	
+
 	public RangersGuild getRangersGuild() {
 		return rangersGuild;
 	}
-	
+
 	public ObjectManager getObjectManager() {
 		return objectManager;
 	}
@@ -251,7 +251,7 @@ public abstract class Player {
 	public PlayerAction getPlayerAction() {
 		return playeraction;
 	}
-	
+
 	public Desert getDesert() {
 		return desert;
 	}
@@ -365,16 +365,16 @@ public abstract class Player {
 	}
 
 	private Map<Integer, TinterfaceText> interfaceText = new HashMap<Integer, TinterfaceText>();
-	
+
 	public class TinterfaceText {
 		public int id;
 		public String currentState;
-		
+
 		public TinterfaceText(String s, int id) {
 			this.currentState = s;
 			this.id = id;
 		}
-		
+
 	}
 
 	public boolean checkPacket126Update(String text, int id) {
@@ -626,7 +626,7 @@ public abstract class Player {
 			}
 			@Override
 				public void stop() {
-					
+
 				}
 		}, 200);
 	}
@@ -644,7 +644,7 @@ public abstract class Player {
 	public boolean isBusy() {
 		return isBusy;
 	}
-	
+
 	 public int getLastLogin() {
 	        Calendar cal = new GregorianCalendar();
 	        int day = cal.get(Calendar.DAY_OF_MONTH);
@@ -974,7 +974,7 @@ public abstract class Player {
 	/**
 	 * Outputs a send packet which is built from the data params provided
 	 * towards a connected user client channel.
-	 * 
+	 *
 	 * @param id
 	 *            The identification number of the sound.
 	 * @param volume
@@ -1000,7 +1000,7 @@ public abstract class Player {
 	/**
 	 * Outputs a send packet which is built from the data params provided
 	 * towards a connected user client channel.
-	 * 
+	 *
 	 * @param id
 	 *            The identification number of the sound.
 	 * @param volume
@@ -1013,7 +1013,7 @@ public abstract class Player {
 	/**
 	 * Outputs a send packet which is built from the data params provided
 	 * towards a connected user client channel.
-	 * 
+	 *
 	 * @param id
 	 *            The identification number of the sound.
 	 */
@@ -1023,7 +1023,7 @@ public abstract class Player {
 
 	/**
 	 * Play sounds
-	 * 
+	 *
 	 * @param SOUNDID
 	 *            : ID
 	 * @param delay
@@ -1074,14 +1074,14 @@ public abstract class Player {
 						}
 						@Override
 							public void stop() {
-								
+
 							}
 					}, 16);
 				}
 			}
 		}
 	}
-	
+
 	 public void trawlerFade(final int x, final int y, final int height) {
 	        if (System.currentTimeMillis() - lastAction > 5000) {
 	            lastAction = System.currentTimeMillis();
@@ -1115,7 +1115,7 @@ public abstract class Player {
 	            }, 1);
 	        }
 	    }
-	
+
 	public void fade(final int x, final int y, final int height) {
         if (System.currentTimeMillis() - lastAction > 5000) {
             lastAction = System.currentTimeMillis();
@@ -1166,7 +1166,7 @@ public abstract class Player {
 
 	/**
 	 * Sets the option clicked
-	 * 
+	 *
 	 * @param i
 	 *            the option clicked
 	 */
@@ -1174,19 +1174,19 @@ public abstract class Player {
 	public void setOptionClicked(int i) {
 		optionClicked = i;
 	}
-	
+
 	public String statedInterface = "";
-	
+
 	public String getStatedInterface() {
 		return statedInterface;
 	}
-	
+
 	public void setStatedInterface(String statedInterface) {
 		this.statedInterface = statedInterface;
 	}
 
 	public String slayerMaster;
-	
+
 	public boolean lostCannon = false, refresh = false, isBot = false;
 
 	public int CannonSetupStage;
@@ -1194,7 +1194,7 @@ public abstract class Player {
 	public ArrayList<String> killedPlayers = new ArrayList<String>();
 	public ArrayList<Integer> attackedPlayers = new ArrayList<Integer>();
 	public ArrayList<String> lastKilledPlayers = new ArrayList<String>();
-	
+
 	public int[][] barrowCrypt = {
 			{4921, 0},
 			{2035, 0}
@@ -1242,7 +1242,7 @@ public abstract class Player {
 			canWalkTutorial, closeTutorialInterface, isCrafting, showedUnfire,
 			showedFire, isPotCrafting, isFiremaking, playerIsFletching, milking,
 			stopPlayerPacket, spiritTree = false, isSmelting,
-			isSmithing, hasPaid, canTeleport, magicCharge, 
+			isSmithing, hasPaid, canTeleport, magicCharge,
 			clickedVamp = false, allowFading, otherBank = false,
 			recievedReward = false, poison, golemSpawned = false, zombieSpawned = false, shadeSpawned = false,
 			treeSpiritSpawned = false, chickenSpawned = false, clickedTree = false, filter = true,
@@ -1273,7 +1273,7 @@ public abstract class Player {
 			rememberNpcIndex, ratsCaught, lastLoginDate, selectedSkill, newHerb,
 			newItem, newXp, doingHerb, herbAmount, treeX, treeY, lastH,
 			cookingItem, cookingObject, summonId, npcId2 = 0, leatherType = -1,
-			weightCarried, teleotherType, rockX, rockY, itemUsing, tzKekTimer, 
+			weightCarried, teleotherType, rockX, rockY, itemUsing, tzKekTimer,
 			bananas, flourAmount, grain, questPoints, questStages,
 			teleGrabItem, teleGrabX, teleGrabY, duelCount, underAttackBy,
 			underAttackBy2, wildLevel, teleTimer, respawnTimer, saveTimer = 0,
@@ -1381,11 +1381,11 @@ public abstract class Player {
 	public boolean[] killedPheasant = new boolean[5];
 	public boolean playerHasRandomEvent;
 	public boolean canLeaveArea;
-	
+
 	public int pieSelect = 0, getPheasent, kebabSelect = 0, breadID,
 			chocSelect = 0, bagelSelect = 0, triangleSandwich = 0,
 			squareSandwich = 0, breadSelect = 0;
-	
+
 	public String properName;
 	public int lastX, lastY;
 	public int[] voidStatus = new int[5];
@@ -1582,8 +1582,18 @@ public abstract class Player {
 	public int XremoveSlot, XinterfaceID, XremoveID, Xamount;
 
 	public boolean isMining;
+	public boolean hasThievedStall;
+
+	public boolean hasThievedStall() {
+		return hasThievedStall;
+	}
+
+	public void setHasThievedStall(boolean hasThievedStall) {
+		this.hasThievedStall = hasThievedStall;
+	}
+
 	public boolean antiFirePot = false;
-	
+
 	public boolean underWater = false;
     public boolean prevRunning2;
     public int prevPrevPlayerRunIndex;
@@ -1597,7 +1607,7 @@ public abstract class Player {
    public Client asClient() {
        return (Client) this;
    }
-   
+
    private Player player;
    public Player asPlayer() {
        return (Player) player;
@@ -1609,7 +1619,7 @@ public abstract class Player {
        }
        return false;
    }
-   
+
    public boolean inTrawlerGame() {
        if(inArea(2808, 2811,3415,3425)) {
            return true;
@@ -1712,7 +1722,7 @@ public abstract class Player {
 		}
 		return false;
 	}
-	
+
 	public boolean inKqArea() {
 		if (absX >= 3467  && absX <= 3506 && absY >= 9477 && absY <= 9513) {
 			return true;
@@ -1771,6 +1781,7 @@ public abstract class Player {
 				isInArea(2379, 4453, 2386, 4462) || // Zanaris
 				isInArea(2582, 3423, 2591, 3417) || //Fishing Guild
 				isInArea(3509, 3483, 3516, 3476) || //Canifis
+				isInArea(3297, 3133, 3311, 3115) || //Shantay Pass
 				false;
 	}
 
@@ -1802,23 +1813,23 @@ public abstract class Player {
 		}
 		return false;
 	}
-	
+
-	
+
 	 public boolean playerIsBusy() {
 	        if(isShopping || inTrade || openDuel || isBanking || duelStatus == 1) {
 	            return true;
 	        }
 	        return false;
 	    }
-	
+
-	public boolean isInBarrows() {		
+	public boolean isInBarrows() {
 		if(absX > 3543 && absX < 3584 && absY > 3265 && absY < 3311) {
 			return true;
 		}
 		return false;
 	}
-	
+
-	public boolean isInBarrows2() {		
+	public boolean isInBarrows2() {
 		if(absX > 3529 && absX < 3581 && absY > 9673 && absY < 9722) {
 			return true;
 		}
@@ -1844,7 +1855,7 @@ public abstract class Player {
 		   return isInAreaxxyy(3090, 3099, 3487, 3500) || isInAreaxxyy(3089, 3090, 3492, 3498) || isInAreaxxyy(3249, 3258, 3413, 3428) || isInAreaxxyy(3180, 3191, 3432, 3448) || isInAreaxxyy(2945, 2948, 3365, 3374) ||
 			   isInAreaxxyy(2943, 2948, 3367, 3374) || isInAreaxxyy(2945, 2950, 3365, 3370) || isInAreaxxyy(3009, 3018, 3352, 3359) || isInAreaxxyy(3017, 3022, 3353, 3357);
 	}
-	
+
 	public boolean inLumbBuilding() {
 		return isInAreaxxyy(3205, 3216, 3209, 3228) || isInAreaxxyy(3229, 3233, 3206, 3208) || isInAreaxxyy(3228, 3233, 3201, 3205) || isInAreaxxyy(3230, 3237, 3195, 3198) || isInAreaxxyy(3238, 3229, 3209, 3211) ||
 			   isInAreaxxyy(3240, 3247, 3204, 3215) || isInAreaxxyy(3247, 3252, 3190, 3195) || isInAreaxxyy(3227, 3230, 3212, 3216) || isInAreaxxyy(3227, 3230, 3221, 3225) || isInAreaxxyy(3229, 3232, 3236, 3241) ||
@@ -2124,7 +2135,7 @@ public abstract class Player {
 		walkingQueueY[wQueueWritePtr] = y;
 		wQueueWritePtr = next;
 	}
-	
+
 	public boolean goodDistance(int objectX, int objectY, int playerX, int playerY, int distance) {
 		return ((objectX-playerX <= distance && objectX-playerX >= -distance) && (objectY-playerY <= distance && objectY-playerY >= -distance));
 	}
@@ -3087,11 +3098,11 @@ public abstract class Player {
 	}
 
 	public void setInStreamDecryption(ISAACRandomGen inStreamDecryption) {
-		
+
 	}
 
 	public void setOutStreamDecryption(ISAACRandomGen outStreamDecryption) {
-		
+
 	}
 
 	public boolean samePlayer() {
@@ -3114,7 +3125,7 @@ public abstract class Player {
 		logoutDelay = System.currentTimeMillis();
 		singleCombatDelay = System.currentTimeMillis();
 	}
-	
+
 
 	public void dealDamage(int damage) {
 		if (teleTimer <= 0) {
@@ -3132,7 +3143,7 @@ public abstract class Player {
 			}
 		}
 	}
-	
+
 	public void appendRedemption() {
 		Client c = (Client) PlayerHandler.players[playerId];
 		if (c.getPrayer().prayerActive[22]) {

2006Redone Server/src/com/rebotted/game/players/PlayerAssistant.java

@@ -693,6 +693,13 @@ public class PlayerAssistant {
 			player.getPacketSender().sendMessage("You can't teleport from a Fight pits Game!");
 			return;
 		}
+		if (player.inWild() && player.wildLevel > GameConstants.NO_TELEPORT_WILD_LEVEL) {
+			player.getPacketSender().sendMessage(
+					"You can't teleport above level "
+							+ GameConstants.NO_TELEPORT_WILD_LEVEL
+							+ " in the wilderness.");
+			return;
+		}
 		if (player.tutorialProgress < 36) {
 			player.getPacketSender().sendMessage("You can't teleport from tutorial island!");
 			return;
@@ -719,14 +726,6 @@ public class PlayerAssistant {
 			player.getPacketSender().sendMessage("This feature is curently disabled.");
 			return;
 		}
-		if (player.inWild()
-				&& player.wildLevel > GameConstants.NO_TELEPORT_WILD_LEVEL) {
-			player.getPacketSender().sendMessage(
-					"You can't teleport above level "
-							+ GameConstants.NO_TELEPORT_WILD_LEVEL
-							+ " in the wilderness.");
-			return;
-		}
 		if (System.currentTimeMillis() - player.teleBlockDelay < player.teleBlockLength) {
 			player.getPacketSender().sendMessage(
 					"You are teleblocked and can't teleport.");

2006Redone Server/src/com/rebotted/net/PacketSender.java

@@ -1068,7 +1068,8 @@ public class PacketSender {
 	 */
 
 	public PacketSender sendSong(int id) {
-		if (player.getOutStream() == null) return this;
+		if (player.getOutStream() == null) 
+			return this;
 		if (player != null && id != -1) {
 			player.getOutStream().createFrame(74);
 			player.getOutStream().writeWordBigEndian(id);
@@ -1081,7 +1082,8 @@ public class PacketSender {
 	 */
 
 	public PacketSender sendQuickSong(int id, int songDelay) {
-		if (player.getOutStream() == null) return this;
+		if (player.getOutStream() == null) 
+			return this;
 		if (player != null) {
 			player.getOutStream().createFrame(121);
 			player.getOutStream().writeWordBigEndian(id);
@@ -1096,7 +1098,8 @@ public class PacketSender {
 	 */
 
 	public PacketSender sendSound(int id, int type, int delay, int volume) {
-		if (player.getOutStream() == null) return this;
+		if (player.getOutStream() == null) 
+			return this;
 		if (player != null && id != -1) {
 			player.getOutStream().createFrame(174);
 			player.getOutStream().writeWord(id);

2006Redone Server/src/com/rebotted/net/packets/impl/ClickingButtons.java

@@ -2,14 +2,13 @@ package com.rebotted.net.packets.impl;
 
 import com.rebotted.game.content.combat.CombatConstants;
 import com.rebotted.game.content.combat.Specials;
-import com.rebotted.game.content.combat.magic.CastOnOther;
+import com.rebotted.game.content.combat.magic.*;
-import com.rebotted.game.content.combat.magic.MagicData;
-import com.rebotted.game.content.combat.magic.MagicTeleports;
 import com.rebotted.game.content.combat.prayer.ActivatePrayers;
 import com.rebotted.game.content.music.Music;
 import com.rebotted.game.content.music.sound.SoundList;
 import com.rebotted.game.content.quests.QuestAssistant;
 import com.rebotted.game.content.random.PartyRoom;
+import com.rebotted.game.content.randomevents.RandomEventHandler;
 import com.rebotted.game.content.randomevents.SandwhichLady;
 import com.rebotted.game.content.skills.cooking.Cooking;
 import com.rebotted.game.content.skills.cooking.CookingTutorialIsland;
@@ -92,73 +91,30 @@ public class ClickingButtons implements PacketType {
             player.droppedItem = -1;
 			break;
 
-		case 50235:
-			MagicTeleports.paddewwaTeleport(player);
-			break;
 
-		case 50245:
+			/**
-			MagicTeleports.senntisenTeleport(player);
+			 * Spellbook Teleports
-			break;
+			 */
 
-		case 50253:
+			case 50235:
-			MagicTeleports.kharyllTeleport(player);
+			case 50245:
-			break;
+			case 50253:
+			case 51005:
+			case 51013:
+			case 51023:
+			case 51031:
+			case 51039:
+			case 4140:
+			case 4143:
+			case 4146:
+			case 4150:
+			case 6004:
+			case 6005:
+			case 29031:
+			case 72038:
+				MagicTeleports.handleSpellTeleport(player, SpellTeleport.forButtonId(actionButtonId));
+				break;
 
-		case 51005:
-			MagicTeleports.lassarTeleport(player);
-			break;
-
-		case 51013:
-			MagicTeleports.dareeyakTeleport(player);
-			break;
-
-		case 51023:
-			MagicTeleports.carrallangarTeleport(player);
-			break;
-
-		case 51031:
-			MagicTeleports.annakarlTeleport(player);
-			break;
-
-		case 51039:
-			MagicTeleports.ghorrockTeleport(player);
-			break;
-
-		case 4140:
-			MagicTeleports.varrockTeleport(player);
-			break;
-
-		case 4143:
-			MagicTeleports.lumbridgeTeleport(player);
-			break;
-
-		case 4146:
-			MagicTeleports.faladorTeleport(player);
-			break;
-
-		case 4150:
-			MagicTeleports.camelotTeleport(player);
-			break;
-
-		case 6004:
-			MagicTeleports.ardougneTeleport(player);
-			break;
-
-		case 6005:
-			MagicTeleports.watchTowerTeleport(player);
-			break;
-
-		case 29031:
-			MagicTeleports.trollhiemTeleport(player);
-			break;
-
-		case 72038:
-			MagicTeleports.apeAtollTeleport(player);
-			break;
-
-		/**
-		 * End of Modern Teleports
-		 */
 
 		case 4135:
 			if (player.inTrade) {
@@ -1409,7 +1365,7 @@ public class ClickingButtons implements PacketType {
 					player.getPacketSender().sendFrame126(
 							"Waiting for other player...", 6571);
 					o1.getPacketSender().sendFrame126(
-							"Other player has accepted", 6571);
+							"Other player has accepted.", 6571);
 				}
 			} else {
 				Client o = (Client) PlayerHandler.players[player.duelingWith];
@@ -1651,7 +1607,7 @@ public class ClickingButtons implements PacketType {
 			}
 			player.getPacketSender().sendFrame126(
 					"Waiting for other player...", 3431);
-			ot.getPacketSender().sendFrame126("Other player has accepted",
+			ot.getPacketSender().sendFrame126("Other player has accepted.",
 					3431);
 			player.goodTrade = true;
 			ot.goodTrade = true;
@@ -1681,15 +1637,15 @@ public class ClickingButtons implements PacketType {
 						player.goodTrade = false;
 						ot.goodTrade = false;
 						player.getPacketSender().sendFrame126(
-								"Not enough space in your inventory.", 3431);
+								"Not enough inventory spaces.", 3431);
 						ot.getPacketSender().sendFrame126(
-								"Not enough space in your inventory.", 3431);
+								"Not enough inventory spaces.", 3431);
 						break;
 					} else {
 						player.getPacketSender().sendFrame126(
 								"Waiting for other player...", 3431);
 						ot.getPacketSender().sendFrame126(
-								"Other player has accepted", 3431);
+								"Other player has accepted.", 3431);
 						player.goodTrade = true;
 						ot.goodTrade = true;
 					}

2006Redone Server/src/com/rebotted/net/packets/impl/Commands.java

@@ -1,13 +1,12 @@
 package com.rebotted.net.packets.impl;
 
-import static com.rebotted.game.content.combat.magic.MagicTeleports.LUMBRIDGE_X;
-import static com.rebotted.game.content.combat.magic.MagicTeleports.LUMBRIDGE_Y;
 import static com.rebotted.util.GameLogger.writeLog;
 import java.util.Arrays;
 import com.rebotted.Connection;
 import com.rebotted.GameConstants;
 import com.rebotted.GameEngine;
 import com.rebotted.game.bots.BotHandler;
+import com.rebotted.game.content.combat.magic.SpellTeleport;
 import com.rebotted.game.items.ItemAssistant;
 import com.rebotted.game.npcs.NpcHandler;
 import com.rebotted.game.players.*;
@@ -254,7 +253,7 @@ public class Commands implements PacketType {
                 player.getPacketSender().showInterface(8134);
                 break;
             case "stuck":
-                player.getPlayerAssistant().startTeleport(LUMBRIDGE_X, LUMBRIDGE_Y, 0, "modern");
+                player.getPlayerAssistant().startTeleport(SpellTeleport.LUMBRIDGE.getDestX(), SpellTeleport.LUMBRIDGE.getDestY(), 0, "modern");
                 player.getPacketSender().sendMessage("How did you manage that one... If it's bug related, please report on Github/Discord!");
                 player.gfx100(80);
                 player.startAnimation(404);
@@ -643,11 +642,11 @@ public class Commands implements PacketType {
                 player.specAmount = 100.0;
                 break;
             case "hp":
-                player.getPacketSender().sendMessage("You attributed yourself 999 999 hitpoints.");
+                player.getPacketSender().sendMessage("You attributed yourself 999,999 hitpoints.");
                 player.playerLevel[3] = 999999;
                 break;
             case "pray":
-                player.getPacketSender().sendMessage("You attributed yourself 999 999 prayer points.");
+                player.getPacketSender().sendMessage("You attributed yourself 999,999 prayer points.");
                 player.playerLevel[5] = 999999;
                 break;
             case "setlevel":
@@ -655,7 +654,7 @@ public class Commands implements PacketType {
             case "skill":
                 try {
                     if (arguments.length < 2) {
-                        player.getPacketSender().sendMessage("Must specify a skill and level: ::setlevel 1 99");
+                        player.getPacketSender().sendMessage("Must specify a skill and level - ::setlevel 1 99");
                         return;
                     }
                     int skill = Integer.parseInt(arguments[0]);

2006Redone Server/src/com/rebotted/world/ItemHandler.java

@@ -33,7 +33,6 @@ public class ItemHandler {
 			ItemList[i] = null;
 		}
 		loadItemList("item.cfg");
-		loadItemPrices("prices.txt");
 	}
 
 	/**