From 89652a45dfffb97db167a75907c6c24065b969c5 Mon Sep 17 00:00:00 2001 From: Ganom Date: Sat, 15 Jun 2019 17:06:01 -0400 Subject: [PATCH] Fix Lizardmen Shaman Previously this was using google eventbus rather than runelites own eventbus. --- .../LizardmenShamanPlugin.java | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java index ba8a011e25..e9eb807ca8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.lizardmenshaman; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.util.HashMap; import java.util.Map; @@ -36,8 +35,10 @@ import net.runelite.api.Actor; import net.runelite.api.Client; import net.runelite.api.coords.LocalPoint; import net.runelite.api.events.AnimationChanged; +import net.runelite.api.events.ChatMessage; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; @@ -94,6 +95,18 @@ public class LizardmenShamanPlugin extends Plugin spawns.clear(); } + @Subscribe + public void onChatMessage(ChatMessage event) + { + if (config.notifyOnSpawn()) + { + if (event.getMessage().contains(MESSAGE)) + { + notifier.notify(MESSAGE); + } + } + } + @Subscribe public void onAnimationChanged(AnimationChanged event) { @@ -102,17 +115,13 @@ public class LizardmenShamanPlugin extends Plugin { return; } - else if (actor.getName().equals(SHAMAN) && actor.getAnimation() == 7157) + + if (actor.getName().equals(SHAMAN) && actor.getAnimation() == 7157) { if (config.showTimer()) { spawns.put(event.getActor().getLocalLocation(), new LizardmenShamanSpawn(8.4, null)); } - - if (config.notifyOnSpawn()) - { - notifier.notify(MESSAGE); - } } } }