Merge pull request #1060 from IanWONeill/master

SafeSpots: only show for Attackable NPCs.
This commit is contained in:
Tyler Bochard
2019-07-20 02:38:35 -04:00
committed by GitHub

View File

@@ -31,6 +31,7 @@ import net.runelite.api.events.GameTick;
import net.runelite.api.events.InteractingChanged; import net.runelite.api.events.InteractingChanged;
import net.runelite.client.config.ConfigManager; import net.runelite.client.config.ConfigManager;
import net.runelite.client.eventbus.EventBus; import net.runelite.client.eventbus.EventBus;
import net.runelite.client.game.NPCManager;
import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.plugins.PluginType; import net.runelite.client.plugins.PluginType;
@@ -58,6 +59,9 @@ public class SafeSpotPlugin extends Plugin
@Inject @Inject
private EventBus eventBus; private EventBus eventBus;
@Inject
private NPCManager npcManager;
@Getter(AccessLevel.PACKAGE) @Getter(AccessLevel.PACKAGE)
private List<Tile> safeSpotList; private List<Tile> safeSpotList;
@@ -126,8 +130,11 @@ public class SafeSpotPlugin extends Plugin
} }
if (client.getLocalPlayer().getInteracting() instanceof NPC && this.npcSafeSpots) if (client.getLocalPlayer().getInteracting() instanceof NPC && this.npcSafeSpots)
{ {
safeSpotsRenderable = true; if (npcManager.getStats(((NPC) client.getLocalPlayer().getInteracting()).getId()) != null)
updateSafeSpots(); {
safeSpotsRenderable = true;
updateSafeSpots();
}
} }
} }
else if (tickCount > 0) else if (tickCount > 0)