ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #2797 from Macweese/PlayerManager-high-risk-world

Browse Source 
PlayerManager: High risk world mechanics
This commit is contained in:
Kyle
2020-09-13 19:33:11 +01:00
committed by GitHub
parent 3787d56213 af733b76b1
commit 85cdd73cb1
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
runelite-client/src/main/java/net/runelite/client/game/PlayerManager.java
View File

@@ -23,6 +23,7 @@ import net.runelite.api.ItemDefinition;
import net.runelite.api.ItemID; import net.runelite.api.ItemID;
import net.runelite.api.NPC; import net.runelite.api.NPC;
import net.runelite.api.Player; import net.runelite.api.Player;
import net.runelite.api.WorldType;
import net.runelite.api.events.AnimationChanged; import net.runelite.api.events.AnimationChanged;
import net.runelite.api.events.PlayerAppearanceChanged; import net.runelite.api.events.PlayerAppearanceChanged;
import net.runelite.api.events.PlayerDespawned; import net.runelite.api.events.PlayerDespawned;
@@ -418,13 +419,16 @@ public class PlayerManager
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, LinkedHashMap::new)) .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); if (player.getPlayer().getSkullIcon() == null)
} {
else removeEntries(player.getRiskedGear(), player.getPrayerLevel() < 25 ? 3 : 4);
{ }
removeEntries(player.getRiskedGear(), player.getPrayerLevel() <= 25 ? 0 : 1); else
{
removeEntries(player.getRiskedGear(), player.getPrayerLevel() < 25 ? 0 : 1);
}
} }
int risk = 0; int risk = 0;