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

PlayerManager: High risk world mechanics
This commit is contained in:
Kyle
2020-09-13 19:33:11 +01:00
committed by GitHub

View File

@@ -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;
@@ -418,13 +419,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;