Merge pull request #4299 from Nightfirecat/fix-dmm-snare-timers

timers plugin: Fix SDMM normal spellbook freezes
This commit is contained in:
Tomas Slusny
2018-08-15 09:23:20 +02:00
committed by GitHub

View File

@@ -42,6 +42,7 @@ import net.runelite.api.NpcID;
import net.runelite.api.Player; import net.runelite.api.Player;
import net.runelite.api.Prayer; import net.runelite.api.Prayer;
import net.runelite.api.Varbits; import net.runelite.api.Varbits;
import net.runelite.api.WorldType;
import net.runelite.api.coords.WorldPoint; import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.AnimationChanged; import net.runelite.api.events.AnimationChanged;
import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ChatMessage;
@@ -589,7 +590,8 @@ public class TimersPlugin extends Plugin
{ {
if (actor.getGraphic() == BIND.getGraphicId()) if (actor.getGraphic() == BIND.getGraphicId())
{ {
if (client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC)) if (client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC)
&& !client.getWorldType().contains(WorldType.SEASONAL_DEADMAN))
{ {
createGameTimer(HALFBIND); createGameTimer(HALFBIND);
} }
@@ -601,7 +603,8 @@ public class TimersPlugin extends Plugin
if (actor.getGraphic() == SNARE.getGraphicId()) if (actor.getGraphic() == SNARE.getGraphicId())
{ {
if (client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC)) if (client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC)
&& !client.getWorldType().contains(WorldType.SEASONAL_DEADMAN))
{ {
createGameTimer(HALFSNARE); createGameTimer(HALFSNARE);
} }
@@ -613,7 +616,8 @@ public class TimersPlugin extends Plugin
if (actor.getGraphic() == ENTANGLE.getGraphicId()) if (actor.getGraphic() == ENTANGLE.getGraphicId())
{ {
if (client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC)) if (client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC)
&& !client.getWorldType().contains(WorldType.SEASONAL_DEADMAN))
{ {
createGameTimer(HALFENTANGLE); createGameTimer(HALFENTANGLE);
} }