diff --git a/2006Redone Client/src/Game.java b/2006Redone Client/src/Game.java index e1ce73e3..7bc6ceb3 100644 --- a/2006Redone Client/src/Game.java +++ b/2006Redone Client/src/Game.java @@ -4771,7 +4771,7 @@ public class Game extends RSApplet { inputTaken = true; } if ((j == 13 || j == 10) && inputString.length() > 0) { - if (inputString.equals("::gfxtgl") || inputString.equals("::tglgfx")) { + if (inputString.equals("::gfxtgl") || inputString.equals("::tglgfx") || inputString.equals("::togglerender") || inputString.equals("::togglegfx")) { graphicsEnabled = !graphicsEnabled; } if (myPrivilege == 2) { diff --git a/2006Redone Server/src/redone/game/content/combat/npcs/NpcAggressive.java b/2006Redone Server/src/redone/game/content/combat/npcs/NpcAggressive.java index 03146fd2..2e41f0b9 100644 --- a/2006Redone Server/src/redone/game/content/combat/npcs/NpcAggressive.java +++ b/2006Redone Server/src/redone/game/content/combat/npcs/NpcAggressive.java @@ -13,7 +13,7 @@ public class NpcAggressive { 1155, 374, 1157, 1158, 1159, 1160, 141, 1459, 1456, 96, 97, 142, 2550, 2551, 2552, 2553, 2558, 2559, 2560, 2561, 2562, 2563, 2564, 2565, 2892, 2894, 2881, 2882, 2883, 172, 1593, 144, 112, 84, 3068, - 50, 1590, 1591, 1592, 53, 54, 55, 178, 49, 174, 2455, 2456, 2454, + 50, 1590, 1591, 1592, 53, 54, 55, 178, 49, 2455, 2456, 2454, 82, 752, 1608, 1609, 1610, 1827, 2783, 1926, 1931, 2457, 412, 1604, 1612, 110, 1611, 83, 941, 49, 117, 111, 125, 1154, 107, 1342, 1338, 447, 448, 449, 917, 1265, 1267 diff --git a/2006Redone Server/src/redone/game/content/skills/core/Woodcutting.java b/2006Redone Server/src/redone/game/content/skills/core/Woodcutting.java index 5ca9ddf1..ae1b006e 100644 --- a/2006Redone Server/src/redone/game/content/skills/core/Woodcutting.java +++ b/2006Redone Server/src/redone/game/content/skills/core/Woodcutting.java @@ -202,6 +202,7 @@ public class Woodcutting { } public static void startWoodcutting(final Client player, final int j, final int x, final int y, final int type) { + CycleEventHandler.getSingleton().stopEvents(player, "WoodcuttingEvent".hashCode()); if (player.isWoodcutting || player.isFletching || player.isFiremaking || player.playerIsFletching) { return; } @@ -236,7 +237,7 @@ public class Woodcutting { return; } if (Misc.goodDistance(player.objectX, player.objectY, player.absX, player.absY, 3)) { - if (player.isWoodcutting == true) { + if (player.isWoodcutting) { player.getActionSender().sendMessage("You are already woodcutting!"); return; } @@ -258,7 +259,7 @@ public class Woodcutting { } else { player.getActionSender().sendMessage("You swing your axe at the tree."); } - CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() { + CycleEventHandler.getSingleton().addEvent("WoodcuttingEvent".hashCode(), player, new CycleEvent() { @Override public void execute(CycleEventContainer container) { diff --git a/2006Redone Server/src/redone/net/packets/impl/Commands.java b/2006Redone Server/src/redone/net/packets/impl/Commands.java index debbe88f..b41e52a0 100644 --- a/2006Redone Server/src/redone/net/packets/impl/Commands.java +++ b/2006Redone Server/src/redone/net/packets/impl/Commands.java @@ -130,7 +130,7 @@ public class Commands implements PacketType { player.getPlayerAssistant().closeAllWindows(); break; case "commands": - player.getActionSender().sendMessage("::players, ::highscores, ::loc, ::stuck, ::randomtoggle, ::debug"); + player.getActionSender().sendMessage("::players, ::highscores, ::loc, ::stuck, ::randomtoggle, ::debug, ::togglegfx"); break; case "loc": player.getActionSender().sendMessage(player.absX + "," + player.absY); @@ -456,6 +456,14 @@ public class Commands implements PacketType { } player.getActionSender().sendMessage("Could not find " + teleTo + " they must be online!"); break; + case "tp": + case "teleport": + case "to": + if (arguments.length <= 2) + player.getPlayerAssistant().movePlayer(Integer.parseInt(arguments[0]), Integer.parseInt(arguments[1]), 0); + else + player.getPlayerAssistant().movePlayer(Integer.parseInt(arguments[0]), Integer.parseInt(arguments[1]), Integer.parseInt(arguments[2])); + break; case "up": player.getPlayerAssistant().movePlayer(player.absX, player.absY, player.heightLevel + 1); player.getActionSender().sendMessage("You are now on height level " + player.heightLevel + "."); diff --git a/CompiledServer/production/2006rebotted/Game.class b/CompiledServer/production/2006rebotted/Game.class index f4bf335a..18e2d662 100644 Binary files a/CompiledServer/production/2006rebotted/Game.class and b/CompiledServer/production/2006rebotted/Game.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/combat/npcs/NpcAggressive.class b/CompiledServer/production/2006rebotted/redone/game/content/combat/npcs/NpcAggressive.class index fd5d43a8..68ae2618 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/combat/npcs/NpcAggressive.class and b/CompiledServer/production/2006rebotted/redone/game/content/combat/npcs/NpcAggressive.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Woodcutting$4.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Woodcutting$4.class index e66b25ff..e9fce61d 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Woodcutting$4.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Woodcutting$4.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Woodcutting.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Woodcutting.class index 47fd67ee..ef0b3c7f 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Woodcutting.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Woodcutting.class differ diff --git a/CompiledServer/production/2006rebotted/redone/net/packets/impl/Commands.class b/CompiledServer/production/2006rebotted/redone/net/packets/impl/Commands.class index 08019abd..f17c96b6 100644 Binary files a/CompiledServer/production/2006rebotted/redone/net/packets/impl/Commands.class and b/CompiledServer/production/2006rebotted/redone/net/packets/impl/Commands.class differ