Updated plugins

This commit is contained in:
James Munson
2019-04-24 17:32:47 -07:00
parent eaacc5ef23
commit e1ffdf24a2
4 changed files with 3 additions and 4 deletions

View File

@@ -136,7 +136,6 @@ public class WidgetID
public static final int MUSICTAB_GROUP_ID = 239; public static final int MUSICTAB_GROUP_ID = 239;
public static final int BARROWS_PUZZLE_GROUP_ID = 25; public static final int BARROWS_PUZZLE_GROUP_ID = 25;
public static final int ITEMS_KEPT_ON_DEATH_GROUP_ID = 4; public static final int ITEMS_KEPT_ON_DEATH_GROUP_ID = 4;
public static final int FISHING_TRAWLER_GROUP_ID = 366;
static class WorldMap static class WorldMap
{ {

View File

@@ -211,7 +211,7 @@ public class MultiIndicatorsPlugin extends Plugin
inDeadman = client.getWorldType().stream().anyMatch(x -> inDeadman = client.getWorldType().stream().anyMatch(x ->
x == WorldType.DEADMAN || x == WorldType.SEASONAL_DEADMAN); x == WorldType.DEADMAN || x == WorldType.SEASONAL_DEADMAN);
inPvp = client.getWorldType().stream().anyMatch(x -> inPvp = client.getWorldType().stream().anyMatch(x ->
x == WorldType.PVP || x == WorldType.PVP_HIGH_RISK); x == WorldType.PVP || x == WorldType.HIGH_RISK);
Rectangle sceneRect = new Rectangle( Rectangle sceneRect = new Rectangle(
client.getBaseX() + 1, client.getBaseY() + 1, client.getBaseX() + 1, client.getBaseY() + 1,

View File

@@ -242,7 +242,7 @@ public class WhaleWatchersPlugin extends Plugin
enableOverlay = true; enableOverlay = true;
} }
if (client.getVar(Varbits.PRAYER_PROTECT_ITEM) == 1 || client.getVar(Varbits.IN_WILDERNESS) == 0 || if (client.getVar(Varbits.PRAYER_PROTECT_ITEM) == 1 || client.getVar(Varbits.IN_WILDERNESS) == 0 ||
client.getWorldType().contains(PVP_HIGH_RISK) || client.getWorld() == 365) client.getWorldType().contains(HIGH_RISK) || client.getWorld() == 365)
{ {
enableOverlay = false; enableOverlay = false;
} }

View File

@@ -47,7 +47,7 @@ public class MiscUtils
if (y < 9920) if (y < 9920)
wildernessLevel = 0; wildernessLevel = 0;
if (client.getWorldType().stream().anyMatch(worldType -> worldType == WorldType.PVP || worldType == WorldType.PVP_HIGH_RISK)) if (client.getWorldType().stream().anyMatch(worldType -> worldType == WorldType.PVP || worldType == WorldType.HIGH_RISK))
{ {
wildernessLevel += 15; wildernessLevel += 15;
} }