diff --git a/2006Redone Server/src/com/rebotted/net/packets/impl/Commands.java b/2006Redone Server/src/com/rebotted/net/packets/impl/Commands.java index fa761c09..3c892111 100644 --- a/2006Redone Server/src/com/rebotted/net/packets/impl/Commands.java +++ b/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); diff --git a/2006Redone Server/src/com/rebotted/world/ItemHandler.java b/2006Redone Server/src/com/rebotted/world/ItemHandler.java index 7291d80a..b7d97a15 100644 --- a/2006Redone Server/src/com/rebotted/world/ItemHandler.java +++ b/2006Redone Server/src/com/rebotted/world/ItemHandler.java @@ -33,7 +33,6 @@ public class ItemHandler { ItemList[i] = null; } loadItemList("item.cfg"); - loadItemPrices("prices.txt"); } /** diff --git a/CompiledServer/production/2006rebotted/com/rebotted/game/content/combat/magic/MagicTeleports.class b/CompiledServer/production/2006rebotted/com/rebotted/game/content/combat/magic/MagicTeleports.class index 9d5f684f..fe7169bc 100644 Binary files a/CompiledServer/production/2006rebotted/com/rebotted/game/content/combat/magic/MagicTeleports.class and b/CompiledServer/production/2006rebotted/com/rebotted/game/content/combat/magic/MagicTeleports.class differ diff --git a/CompiledServer/production/2006rebotted/com/rebotted/game/content/combat/magic/SpellTeleport.class b/CompiledServer/production/2006rebotted/com/rebotted/game/content/combat/magic/SpellTeleport.class new file mode 100644 index 00000000..c25dcc8c Binary files /dev/null and b/CompiledServer/production/2006rebotted/com/rebotted/game/content/combat/magic/SpellTeleport.class differ diff --git a/CompiledServer/production/2006rebotted/com/rebotted/game/items/ItemAssistant.class b/CompiledServer/production/2006rebotted/com/rebotted/game/items/ItemAssistant.class index 90fd364d..9915f446 100644 Binary files a/CompiledServer/production/2006rebotted/com/rebotted/game/items/ItemAssistant.class and b/CompiledServer/production/2006rebotted/com/rebotted/game/items/ItemAssistant.class differ diff --git a/CompiledServer/production/2006rebotted/com/rebotted/game/items/Weight.class b/CompiledServer/production/2006rebotted/com/rebotted/game/items/Weight.class index e3139c37..01181d81 100644 Binary files a/CompiledServer/production/2006rebotted/com/rebotted/game/items/Weight.class and b/CompiledServer/production/2006rebotted/com/rebotted/game/items/Weight.class differ diff --git a/CompiledServer/production/2006rebotted/com/rebotted/game/players/Player.class b/CompiledServer/production/2006rebotted/com/rebotted/game/players/Player.class index c9d52fd6..7c91d88e 100644 Binary files a/CompiledServer/production/2006rebotted/com/rebotted/game/players/Player.class and b/CompiledServer/production/2006rebotted/com/rebotted/game/players/Player.class differ diff --git a/CompiledServer/production/2006rebotted/com/rebotted/game/players/PlayerAssistant$2.class b/CompiledServer/production/2006rebotted/com/rebotted/game/players/PlayerAssistant$2.class index 96b9d9fc..9782691b 100644 Binary files a/CompiledServer/production/2006rebotted/com/rebotted/game/players/PlayerAssistant$2.class and b/CompiledServer/production/2006rebotted/com/rebotted/game/players/PlayerAssistant$2.class differ diff --git a/CompiledServer/production/2006rebotted/com/rebotted/game/players/PlayerAssistant.class b/CompiledServer/production/2006rebotted/com/rebotted/game/players/PlayerAssistant.class index 4149175c..c1a3e8a7 100644 Binary files a/CompiledServer/production/2006rebotted/com/rebotted/game/players/PlayerAssistant.class and b/CompiledServer/production/2006rebotted/com/rebotted/game/players/PlayerAssistant.class differ diff --git a/CompiledServer/production/2006rebotted/com/rebotted/net/packets/impl/ClickingButtons.class b/CompiledServer/production/2006rebotted/com/rebotted/net/packets/impl/ClickingButtons.class index bc75db4b..8984f9c5 100644 Binary files a/CompiledServer/production/2006rebotted/com/rebotted/net/packets/impl/ClickingButtons.class and b/CompiledServer/production/2006rebotted/com/rebotted/net/packets/impl/ClickingButtons.class differ diff --git a/CompiledServer/production/2006rebotted/com/rebotted/net/packets/impl/Commands$1.class b/CompiledServer/production/2006rebotted/com/rebotted/net/packets/impl/Commands$1.class index 9dcae5ef..ba3ba50e 100644 Binary files a/CompiledServer/production/2006rebotted/com/rebotted/net/packets/impl/Commands$1.class and b/CompiledServer/production/2006rebotted/com/rebotted/net/packets/impl/Commands$1.class differ diff --git a/CompiledServer/production/2006rebotted/com/rebotted/net/packets/impl/Commands.class b/CompiledServer/production/2006rebotted/com/rebotted/net/packets/impl/Commands.class index fad179bb..596f1455 100644 Binary files a/CompiledServer/production/2006rebotted/com/rebotted/net/packets/impl/Commands.class and b/CompiledServer/production/2006rebotted/com/rebotted/net/packets/impl/Commands.class differ diff --git a/CompiledServer/production/2006rebotted/com/rebotted/world/ItemHandler.class b/CompiledServer/production/2006rebotted/com/rebotted/world/ItemHandler.class index 137dbcb1..64008cdf 100644 Binary files a/CompiledServer/production/2006rebotted/com/rebotted/world/ItemHandler.class and b/CompiledServer/production/2006rebotted/com/rebotted/world/ItemHandler.class differ