diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/entityhider/EntityHiderPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/entityhider/EntityHiderPlugin.java index 5d316bf130..55e53be632 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/entityhider/EntityHiderPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/entityhider/EntityHiderPlugin.java @@ -36,8 +36,6 @@ import javax.inject.Inject; import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.GameState; -import net.runelite.api.Player; -import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.GameStateChanged; import net.runelite.api.util.Text; import net.runelite.client.config.ConfigManager; @@ -137,35 +135,25 @@ public class EntityHiderPlugin extends Plugin { if (event.getGameState() == GameState.LOGGED_IN) { - client.setIsHidingEntities(isPlayerRegionAllowed()); + client.setIsHidingEntities(true); } } private void updateConfig() { - client.setIsHidingEntities(isPlayerRegionAllowed()); - + client.setIsHidingEntities(true); client.setPlayersHidden(config.hidePlayers()); client.setPlayersHidden2D(config.hidePlayers2D()); client.setHideSpecificPlayers(Text.fromCSV(config.hideSpecificPlayers())); - client.setFriendsHidden(config.hideFriends()); client.setClanMatesHidden(config.hideClanMates()); - client.setLocalPlayerHidden(config.hideLocalPlayer()); client.setLocalPlayerHidden2D(config.hideLocalPlayer2D()); - client.setNPCsHidden(config.hideNPCs()); client.setNPCsHidden2D(config.hideNPCs2D()); - //client.setNPCsNames(Text.fromCSV(config.hideNPCsNames())); - //client.setNPCsHiddenOnDeath(Text.fromCSV(config.hideNPCsOnDeath())); - client.setPetsHidden(config.hidePets()); - client.setAttackersHidden(config.hideAttackers()); - client.setProjectilesHidden(config.hideProjectiles()); - client.setDeadNPCsHidden(config.hideDeadNPCs()); } @@ -173,44 +161,19 @@ public class EntityHiderPlugin extends Plugin protected void shutDown() { client.setIsHidingEntities(false); - client.setPlayersHidden(false); client.setPlayersHidden2D(false); - client.setFriendsHidden(false); client.setClanMatesHidden(false); - client.setLocalPlayerHidden(false); client.setLocalPlayerHidden2D(false); - client.setNPCsHidden(false); client.setNPCsHidden2D(false); - client.setPetsHidden(false); - client.setAttackersHidden(false); - client.setProjectilesHidden(false); - client.setDeadNPCsHidden(false); - Text.fromCSV(config.hideNPCsNames()).forEach(client::removeHiddenNpcName); Text.fromCSV(config.hideNPCsOnDeath()).forEach(client::removeHiddenNpcDeath); } - - private boolean isPlayerRegionAllowed() - { - final Player localPlayer = client.getLocalPlayer(); - - if (localPlayer == null) - { - return true; - } - - final WorldPoint worldPoint = WorldPoint.fromLocalInstance(client, client.getLocalPlayer().getLocalLocation()); - final int playerRegionID = worldPoint == null ? 0 : worldPoint.getRegionID(); - - // 9520 = Castle Wars - return playerRegionID != 9520; - } }