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

PlayerManager: High risk world mechanics

Browse Source 
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.
This commit is contained in:
Macweese
2020-09-06 19:30:46 +02:00
parent 03f73e32ab
commit f93d7e8847
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;