diff --git a/2006Redone Server/src/redone/game/content/randomevents/RandomEventHandler.java b/2006Redone Server/src/redone/game/content/randomevents/RandomEventHandler.java index 2acb85fc..fc3a0510 100644 --- a/2006Redone Server/src/redone/game/content/randomevents/RandomEventHandler.java +++ b/2006Redone Server/src/redone/game/content/randomevents/RandomEventHandler.java @@ -61,7 +61,7 @@ public class RandomEventHandler { } public static void addRandom(Client player) { - if (player.randomToggle) + if (player.randomEventsEnabled) { if (player.randomActions >= CALL_RANDOM) { callRandom(player); diff --git a/2006Redone Server/src/redone/game/content/skills/core/Fishing.java b/2006Redone Server/src/redone/game/content/skills/core/Fishing.java index 1b259a90..14337175 100644 --- a/2006Redone Server/src/redone/game/content/skills/core/Fishing.java +++ b/2006Redone Server/src/redone/game/content/skills/core/Fishing.java @@ -288,7 +288,7 @@ public class Fishing extends SkillHandler { "") + "."); } - if (c.playerSkillProp[10][1] > 0 && !c.randomToggle) { + if (c.playerSkillProp[10][1] > 0 && c.randomEventsEnabled) { randomEvents(c); } if (c.isBotting == true) { diff --git a/2006Redone Server/src/redone/game/content/skills/core/Prayer.java b/2006Redone Server/src/redone/game/content/skills/core/Prayer.java index 5ca71df5..0f6e326f 100644 --- a/2006Redone Server/src/redone/game/content/skills/core/Prayer.java +++ b/2006Redone Server/src/redone/game/content/skills/core/Prayer.java @@ -55,7 +55,7 @@ public class Prayer { } private static void handleBones(final Client c, int i, int slot) { - if(!c.randomToggle) { + if(c.randomEventsEnabled) { if (Misc.random(300) == 4 && c.shadeSpawned == false) { Zombie.spawnZombie(c); } else if (Misc.random(300) == 2 && c.zombieSpawned == false) { 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 1a4f57b2..c87991a0 100644 --- a/2006Redone Server/src/redone/game/content/skills/core/Woodcutting.java +++ b/2006Redone Server/src/redone/game/content/skills/core/Woodcutting.java @@ -13,7 +13,6 @@ import redone.game.objects.Object; import redone.game.players.Client; import redone.game.players.Player; import redone.game.players.PlayerHandler; -import redone.game.players.antimacro.AntiBotting; import redone.util.Misc; /** @@ -281,7 +280,7 @@ public class Woodcutting { if (player.isWoodcutting && player.tutorialProgress >= 36 && player.treeSpiritSpawned == false) { RandomEventHandler.addRandom(player); } - if (player.isWoodcutting && Misc.random(350) == 69 && player.tutorialProgress >= 36 && player.randomToggle) { + if (player.isWoodcutting && Misc.random(350) == 69 && player.tutorialProgress >= 36 && player.randomEventsEnabled) { TreeSpirit.spawnTreeSpirit(player); } if (player.playerIsFletching || player.isFiremaking) { diff --git a/2006Redone Server/src/redone/game/players/Player.java b/2006Redone Server/src/redone/game/players/Player.java index 30a2304b..2129b0c5 100644 --- a/2006Redone Server/src/redone/game/players/Player.java +++ b/2006Redone Server/src/redone/game/players/Player.java @@ -81,7 +81,7 @@ public abstract class Player { treeSpiritSpawned = false, chickenSpawned = false, clickedTree = false, filter = true, stopPlayer = false, npcCanAttack = true, gliderOpen = false, hasSandwhichLady = false, isHarvesting, openDuel = false, killedJad = false, canHealersRespawn = true, playerIsBusy = false, miningRock, - randomToggle = false, debugMode = false; + randomEventsEnabled = false, debugMode = false; public int thankedForDonation, saveDelay, playerKilled, gertCat, restGhost, romeojuliet, runeMist, vampSlayer, cookAss, doricQuest, diff --git a/2006Redone Server/src/redone/game/players/PlayerSave.java b/2006Redone Server/src/redone/game/players/PlayerSave.java index 2019e257..1ce2cd79 100644 --- a/2006Redone Server/src/redone/game/players/PlayerSave.java +++ b/2006Redone Server/src/redone/game/players/PlayerSave.java @@ -238,7 +238,7 @@ public class PlayerSave { player.ratdied2 = Boolean.parseBoolean(token2); break; case "randomToggle": - player.randomToggle = Boolean.parseBoolean(token2); + player.randomEventsEnabled = Boolean.parseBoolean(token2); break; case "questStages": player.questStages = Integer.parseInt(token2); @@ -887,8 +887,8 @@ public class PlayerSave { .toString(player.debugMode).length()); characterfile.newLine(); characterfile.write("randomToggle = ", 0, 15); - characterfile.write(Boolean.toString(player.randomToggle), 0, Boolean - .toString(player.randomToggle).length()); + characterfile.write(Boolean.toString(player.randomEventsEnabled), 0, Boolean + .toString(player.randomEventsEnabled).length()); characterfile.newLine(); characterfile.write("teleblock-length = ", 0, 19); characterfile.write(Integer.toString(tbTime), 0, diff --git a/2006Redone Server/src/redone/net/packets/impl/Commands.java b/2006Redone Server/src/redone/net/packets/impl/Commands.java index c632c6fe..2b38a66a 100644 --- a/2006Redone Server/src/redone/net/packets/impl/Commands.java +++ b/2006Redone Server/src/redone/net/packets/impl/Commands.java @@ -99,8 +99,8 @@ public class Commands implements PacketType { break; case "randomtoggle": case "togglerandom": - player.randomToggle = !player.randomToggle; - message = player.randomToggle ? "You will now receive random events." : "You will no longer receieve random events."; + player.randomEventsEnabled = !player.randomEventsEnabled; + message = player.randomEventsEnabled ? "You will now receive random events." : "You will no longer receieve random events."; player.getActionSender().sendMessage(message); break; case "debug":