From 89af7a7dadb722114ff29d5714540527abd07c7a Mon Sep 17 00:00:00 2001
From: Kyle <48519776+xKylee@users.noreply.github.com>
Date: Thu, 5 Sep 2019 03:27:12 +0100
Subject: [PATCH] remove pvp safespots (#1543)

blame jamflex
---
 .../client/plugins/safespot/SafeSpotConfig.java  | 13 +------------
 .../client/plugins/safespot/SafeSpotPlugin.java  | 16 ++++------------
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotConfig.java
index d9a42c2207..71a5ecd54a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotConfig.java
@@ -19,17 +19,6 @@ public interface SafeSpotConfig extends Config
 {
 	@ConfigItem(
 		position = 1,
-		keyName = "playerSafeSpots",
-		name = "Render for Players",
-		description = "Renders 1 way safe spots vs other players"
-	)
-	default boolean playerSafeSpots()
-	{
-		return true;
-	}
-
-	@ConfigItem(
-		position = 2,
 		keyName = "npcSafeSpots",
 		name = "Render for NPCs",
 		description = "Renders 1 way safe spots vs NPCs"
@@ -40,7 +29,7 @@ public interface SafeSpotConfig extends Config
 	}
 
 	@ConfigItem(
-		position = 3,
+		position = 2,
 		keyName = "tileColor",
 		name = "Tile Color",
 		description = "Color of safe spot tile"
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java
index 72066225dd..237414a0ac 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java
@@ -21,7 +21,6 @@ import net.runelite.api.Actor;
 import net.runelite.api.Client;
 import net.runelite.api.CollisionDataFlag;
 import net.runelite.api.NPC;
-import net.runelite.api.Player;
 import net.runelite.api.Tile;
 import net.runelite.api.coords.LocalPoint;
 import net.runelite.api.coords.WorldArea;
@@ -38,10 +37,10 @@ import net.runelite.client.plugins.PluginType;
 import net.runelite.client.ui.overlay.OverlayManager;
 
 @PluginDescriptor(
-	name = "1 Way Safe Spots",
+	name = "NPC Safe Spots",
 	description = "Renders tile overlays for one way safe spots",
-	tags = {"safe spot", "pvp", "safespots", "pklite"},
-	type = PluginType.UTILITY,
+	tags = {"safe spot", "safespots", "pvm"},
+	type = PluginType.PVM,
 	enabledByDefault = false
 )
 @Singleton
@@ -71,7 +70,6 @@ public class SafeSpotPlugin extends Plugin
 	private SafeSpotOverlay safeSpotOverlay;
 	private int tickCount = 0;
 
-	private boolean playerSafeSpots;
 	private boolean npcSafeSpots;
 	@Getter(AccessLevel.PACKAGE)
 	private Color tileColor;
@@ -113,7 +111,7 @@ public class SafeSpotPlugin extends Plugin
 		{
 			return;
 		}
-		if (event.getTarget() == null && (this.npcSafeSpots || this.playerSafeSpots))
+		if (event.getTarget() == null && this.npcSafeSpots)
 		{
 			tickCount = 10;
 		}
@@ -123,11 +121,6 @@ public class SafeSpotPlugin extends Plugin
 	{
 		if (client.getLocalPlayer().getInteracting() != null)
 		{
-			if (client.getLocalPlayer().getInteracting() instanceof Player && this.playerSafeSpots)
-			{
-				safeSpotsRenderable = true;
-				updateSafeSpots();
-			}
 			if (client.getLocalPlayer().getInteracting() instanceof NPC && this.npcSafeSpots)
 			{
 				if (npcManager.getStats(((NPC) client.getLocalPlayer().getInteracting()).getId()) != null)
@@ -215,7 +208,6 @@ public class SafeSpotPlugin extends Plugin
 
 	private void updateConfig()
 	{
-		this.playerSafeSpots = config.playerSafeSpots();
 		this.npcSafeSpots = config.npcSafeSpots();
 		this.tileColor = config.tileColor();
 	}