2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-07 08:39:07 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

randomToggle -> randomEventsEnabled (#45)

Browse Source 
Fix prayer and fishing random event checks
This commit is contained in:
Danial
2019-10-11 00:35:00 +13:00
committed by Daniel Ginovker
parent 6f92f19327
commit 83e612b50f
7 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/redone/game/content/randomevents/RandomEventHandler.java
+1 -1
View File
@@ -61,7 +61,7 @@ public class RandomEventHandler {
} }
public static void addRandom(Client player) { public static void addRandom(Client player) {
if (player.randomToggle) if (player.randomEventsEnabled)
{ {
if (player.randomActions >= CALL_RANDOM) { if (player.randomActions >= CALL_RANDOM) {
callRandom(player); callRandom(player);
2006Redone Server/src/redone/game/content/skills/core/Fishing.java
+1 -1
View File
@@ -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); randomEvents(c);
} }
if (c.isBotting == true) { if (c.isBotting == true) {
2006Redone Server/src/redone/game/content/skills/core/Prayer.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class Prayer {
} }
private static void handleBones(final Client c, int i, int slot) { 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) { if (Misc.random(300) == 4 && c.shadeSpawned == false) {
Zombie.spawnZombie(c); Zombie.spawnZombie(c);
} else if (Misc.random(300) == 2 && c.zombieSpawned == false) { } else if (Misc.random(300) == 2 && c.zombieSpawned == false) {
2006Redone Server/src/redone/game/content/skills/core/Woodcutting.java
+1 -2
View File
@@ -13,7 +13,6 @@ import redone.game.objects.Object;
import redone.game.players.Client; import redone.game.players.Client;
import redone.game.players.Player; import redone.game.players.Player;
import redone.game.players.PlayerHandler; import redone.game.players.PlayerHandler;
import redone.game.players.antimacro.AntiBotting;
import redone.util.Misc; import redone.util.Misc;
/** /**
@@ -281,7 +280,7 @@ public class Woodcutting {
if (player.isWoodcutting && player.tutorialProgress >= 36 && player.treeSpiritSpawned == false) { if (player.isWoodcutting && player.tutorialProgress >= 36 && player.treeSpiritSpawned == false) {
RandomEventHandler.addRandom(player); 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); TreeSpirit.spawnTreeSpirit(player);
} }
if (player.playerIsFletching || player.isFiremaking) { if (player.playerIsFletching || player.isFiremaking) {
2006Redone Server/src/redone/game/players/Player.java
+1 -1
View File
@@ -81,7 +81,7 @@ public abstract class Player {
treeSpiritSpawned = false, chickenSpawned = false, clickedTree = false, filter = true, treeSpiritSpawned = false, chickenSpawned = false, clickedTree = false, filter = true,
stopPlayer = false, npcCanAttack = true, gliderOpen = false, hasSandwhichLady = false, stopPlayer = false, npcCanAttack = true, gliderOpen = false, hasSandwhichLady = false,
isHarvesting, openDuel = false, killedJad = false, canHealersRespawn = true, playerIsBusy = false, miningRock, 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, public int thankedForDonation, saveDelay, playerKilled, gertCat, restGhost,
romeojuliet, runeMist, vampSlayer, cookAss, doricQuest, romeojuliet, runeMist, vampSlayer, cookAss, doricQuest,
2006Redone Server/src/redone/game/players/PlayerSave.java
+3 -3
View File
@@ -238,7 +238,7 @@ public class PlayerSave {
player.ratdied2 = Boolean.parseBoolean(token2); player.ratdied2 = Boolean.parseBoolean(token2);
break; break;
case "randomToggle": case "randomToggle":
player.randomToggle = Boolean.parseBoolean(token2); player.randomEventsEnabled = Boolean.parseBoolean(token2);
break; break;
case "questStages": case "questStages":
player.questStages = Integer.parseInt(token2); player.questStages = Integer.parseInt(token2);
@@ -887,8 +887,8 @@ public class PlayerSave {
.toString(player.debugMode).length()); .toString(player.debugMode).length());
characterfile.newLine(); characterfile.newLine();
characterfile.write("randomToggle = ", 0, 15); characterfile.write("randomToggle = ", 0, 15);
characterfile.write(Boolean.toString(player.randomToggle), 0, Boolean characterfile.write(Boolean.toString(player.randomEventsEnabled), 0, Boolean
.toString(player.randomToggle).length()); .toString(player.randomEventsEnabled).length());
characterfile.newLine(); characterfile.newLine();
characterfile.write("teleblock-length = ", 0, 19); characterfile.write("teleblock-length = ", 0, 19);
characterfile.write(Integer.toString(tbTime), 0, characterfile.write(Integer.toString(tbTime), 0,
2006Redone Server/src/redone/net/packets/impl/Commands.java
+2 -2
View File
@@ -99,8 +99,8 @@ public class Commands implements PacketType {
break; break;
case "randomtoggle": case "randomtoggle":
case "togglerandom": case "togglerandom":
player.randomToggle = !player.randomToggle; player.randomEventsEnabled = !player.randomEventsEnabled;
message = player.randomToggle ? "You will now receive random events." : "You will no longer receieve random events."; message = player.randomEventsEnabled ? "You will now receive random events." : "You will no longer receieve random events.";
player.getActionSender().sendMessage(message); player.getActionSender().sendMessage(message);
break; break;
case "debug": case "debug":