From e1ffdf24a2990c2693a026e19495e40a4665b847 Mon Sep 17 00:00:00 2001 From: James Munson Date: Wed, 24 Apr 2019 17:32:47 -0700 Subject: [PATCH] Updated plugins --- .../src/main/java/net/runelite/api/widgets/WidgetID.java | 1 - .../client/plugins/multiindicators/MultiIndicatorsPlugin.java | 2 +- .../client/plugins/whalewatchers/WhaleWatchersPlugin.java | 2 +- .../src/main/java/net/runelite/client/util/MiscUtils.java | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java index 42428ce9ed..bb10df74ad 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java @@ -136,7 +136,6 @@ public class WidgetID public static final int MUSICTAB_GROUP_ID = 239; public static final int BARROWS_PUZZLE_GROUP_ID = 25; public static final int ITEMS_KEPT_ON_DEATH_GROUP_ID = 4; - public static final int FISHING_TRAWLER_GROUP_ID = 366; static class WorldMap { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java index 5c24ec6f95..4882930ed6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java @@ -211,7 +211,7 @@ public class MultiIndicatorsPlugin extends Plugin inDeadman = client.getWorldType().stream().anyMatch(x -> x == WorldType.DEADMAN || x == WorldType.SEASONAL_DEADMAN); 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( client.getBaseX() + 1, client.getBaseY() + 1, diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java index 356b846bdc..86f33b2704 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java @@ -242,7 +242,7 @@ public class WhaleWatchersPlugin extends Plugin enableOverlay = true; } 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; } diff --git a/runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java b/runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java index 039c3cfa2b..077439ee88 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java +++ b/runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java @@ -47,7 +47,7 @@ public class MiscUtils if (y < 9920) 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; }