From f93d7e8847763464656e465bf0c57405143e8666 Mon Sep 17 00:00:00 2001
From: Macweese <50101641+Macweese@users.noreply.github.com;macweese@pm.me>
Date: Sun, 6 Sep 2020 19:30:46 +0200
Subject: [PATCH 1/3] PlayerManager: High risk world mechanics

Update PlayerManager to work with the latest changes made to high risk worlds.

Protect item prayer is completely disabled on high risk worlds.

Also changed the ternary operator to only apply if the prayer level is less than 25, since players can use the prayer if they are 25 prayer.
---
 .../runelite/client/game/PlayerManager.java   | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/game/PlayerManager.java b/runelite-client/src/main/java/net/runelite/client/game/PlayerManager.java
index 30c8f976a1..e1d7f605b5 100644
--- a/runelite-client/src/main/java/net/runelite/client/game/PlayerManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/game/PlayerManager.java
@@ -17,12 +17,7 @@ import javax.annotation.Nullable;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
-import net.runelite.api.Actor;
-import net.runelite.api.Client;
-import net.runelite.api.ItemDefinition;
-import net.runelite.api.ItemID;
-import net.runelite.api.NPC;
-import net.runelite.api.Player;
+import net.runelite.api.*;
 import net.runelite.api.events.AnimationChanged;
 import net.runelite.api.events.PlayerAppearanceChanged;
 import net.runelite.api.events.PlayerDespawned;
@@ -418,13 +413,16 @@ public class PlayerManager
 			.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, LinkedHashMap::new))
 		);
 
-		if (player.getPlayer().getSkullIcon() == null)
+		if (client.getWorldType().stream().noneMatch(x -> x == WorldType.HIGH_RISK))
 		{
-			removeEntries(player.getRiskedGear(), player.getPrayerLevel() <= 25 ? 3 : 4);
-		}
-		else
-		{
-			removeEntries(player.getRiskedGear(), player.getPrayerLevel() <= 25 ? 0 : 1);
+			if (player.getPlayer().getSkullIcon() == null)
+			{
+				removeEntries(player.getRiskedGear(), player.getPrayerLevel() < 25 ? 3 : 4);
+			}
+			else
+			{
+				removeEntries(player.getRiskedGear(), player.getPrayerLevel() < 25 ? 0 : 1);
+			}
 		}
 
 		int risk = 0;

From 5166e9921eca758eb9e4c980c06be858cb11d92e Mon Sep 17 00:00:00 2001
From: Macweese <50101641+Macweese@users.noreply.github.com>
Date: Sun, 6 Sep 2020 19:39:30 +0200
Subject: [PATCH 2/3] PlayerManager: High risk world mechanics

Checkstyle
---
 .../main/java/net/runelite/client/game/PlayerManager.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/game/PlayerManager.java b/runelite-client/src/main/java/net/runelite/client/game/PlayerManager.java
index e1d7f605b5..17ded47232 100644
--- a/runelite-client/src/main/java/net/runelite/client/game/PlayerManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/game/PlayerManager.java
@@ -17,7 +17,12 @@ import javax.annotation.Nullable;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
-import net.runelite.api.*;
+import net.runelite.api.Actor;
+import net.runelite.api.Client;
+import net.runelite.api.ItemDefinition;
+import net.runelite.api.ItemID;
+import net.runelite.api.NPC;
+import net.runelite.api.Player;
 import net.runelite.api.events.AnimationChanged;
 import net.runelite.api.events.PlayerAppearanceChanged;
 import net.runelite.api.events.PlayerDespawned;

From af733b76b10d11e9df652145090731d0f9c031a8 Mon Sep 17 00:00:00 2001
From: Macweese <50101641+Macweese@users.noreply.github.com>
Date: Sun, 6 Sep 2020 19:49:15 +0200
Subject: [PATCH 3/3] import worldtype maybe

ape
---
 .../src/main/java/net/runelite/client/game/PlayerManager.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/runelite-client/src/main/java/net/runelite/client/game/PlayerManager.java b/runelite-client/src/main/java/net/runelite/client/game/PlayerManager.java
index 17ded47232..d395567dfc 100644
--- a/runelite-client/src/main/java/net/runelite/client/game/PlayerManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/game/PlayerManager.java
@@ -23,6 +23,7 @@ import net.runelite.api.ItemDefinition;
 import net.runelite.api.ItemID;
 import net.runelite.api.NPC;
 import net.runelite.api.Player;
+import net.runelite.api.WorldType;
 import net.runelite.api.events.AnimationChanged;
 import net.runelite.api.events.PlayerAppearanceChanged;
 import net.runelite.api.events.PlayerDespawned;