diff --git a/runelite-api/src/main/java/net/runelite/api/GraphicID.java b/runelite-api/src/main/java/net/runelite/api/GraphicID.java index d13f5b9396..f770d39ada 100644 --- a/runelite-api/src/main/java/net/runelite/api/GraphicID.java +++ b/runelite-api/src/main/java/net/runelite/api/GraphicID.java @@ -26,7 +26,7 @@ package net.runelite.api; public class GraphicID { - public static final int CHARGE = 111; + public static final int TELEPORT = 111; public static final int ENTANGLE = 179; public static final int SNARE = 180; public static final int BIND = 181; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java index 988fc90706..9a9ef15073 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java @@ -70,7 +70,7 @@ public enum GameTimer GOD_WARS_ALTAR("altar", "God wars altar", 10, ChronoUnit.MINUTES), ANTIPOISON("antipoison", "Antipoison", 90, ChronoUnit.SECONDS), SUPERANTIPOISON("superantipoison", "Superantipoison", 346, ChronoUnit.SECONDS), - CHARGE("charge", "Charge", GraphicID.CHARGE, 6, ChronoUnit.MINUTES); + CHARGE("charge", "Charge", 6, ChronoUnit.MINUTES); @Getter private final String imageResource; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java index 31f9603fb1..f493f65a7a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java @@ -402,6 +402,16 @@ public class TimersPlugin extends Plugin { createGameTimer(PRAYER_ENHANCE); } + + if (config.showCharge() && event.getMessage().equals("You feel charged with magic power.")) + { + createGameTimer(CHARGE); + } + + if (event.getMessage().equals("Your magical charge fades away.")) + { + removeGameTimer(CHARGE); + } } @Subscribe @@ -431,11 +441,6 @@ public class TimersPlugin extends Plugin return; } - if (config.showCharge() && actor.getGraphic() == CHARGE.getGraphicId()) - { - createGameTimer(CHARGE); - } - if (config.showImbuedHeart() && actor.getGraphic() == IMBUEDHEART.getGraphicId()) { createGameTimer(IMBUEDHEART);