ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #2302 from xKylee/cwar

Browse Source 
entityhiding: remove cwars limitation
This commit is contained in:
Tyler Bochard
2020-01-31 11:29:19 -05:00
committed by GitHub
parent 2ab5d72b52 2fcbb9d1ee
commit ae3108d3cc
2 changed files with 4 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
runelite-client/src/main/java/net/runelite/client/plugins/entityhider/EntityHiderPlugin.java
View File

@@ -36,8 +36,6 @@ import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.GameState; 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.events.GameStateChanged;
import net.runelite.api.util.Text; import net.runelite.api.util.Text;
import net.runelite.client.config.ConfigManager; import net.runelite.client.config.ConfigManager;
@@ -137,35 +135,25 @@ public class EntityHiderPlugin extends Plugin
{ {
if (event.getGameState() == GameState.LOGGED_IN) if (event.getGameState() == GameState.LOGGED_IN)
{ {
client.setIsHidingEntities(isPlayerRegionAllowed()); client.setIsHidingEntities(true);
} }
} }
private void updateConfig() private void updateConfig()
{ {
client.setIsHidingEntities(isPlayerRegionAllowed()); client.setIsHidingEntities(true);
client.setPlayersHidden(config.hidePlayers()); client.setPlayersHidden(config.hidePlayers());
client.setPlayersHidden2D(config.hidePlayers2D()); client.setPlayersHidden2D(config.hidePlayers2D());
client.setHideSpecificPlayers(Text.fromCSV(config.hideSpecificPlayers())); client.setHideSpecificPlayers(Text.fromCSV(config.hideSpecificPlayers()));
client.setFriendsHidden(config.hideFriends()); client.setFriendsHidden(config.hideFriends());
client.setClanMatesHidden(config.hideClanMates()); client.setClanMatesHidden(config.hideClanMates());
client.setLocalPlayerHidden(config.hideLocalPlayer()); client.setLocalPlayerHidden(config.hideLocalPlayer());
client.setLocalPlayerHidden2D(config.hideLocalPlayer2D()); client.setLocalPlayerHidden2D(config.hideLocalPlayer2D());
client.setNPCsHidden(config.hideNPCs()); client.setNPCsHidden(config.hideNPCs());
client.setNPCsHidden2D(config.hideNPCs2D()); client.setNPCsHidden2D(config.hideNPCs2D());
//client.setNPCsNames(Text.fromCSV(config.hideNPCsNames()));
//client.setNPCsHiddenOnDeath(Text.fromCSV(config.hideNPCsOnDeath()));
client.setPetsHidden(config.hidePets()); client.setPetsHidden(config.hidePets());
client.setAttackersHidden(config.hideAttackers()); client.setAttackersHidden(config.hideAttackers());
client.setProjectilesHidden(config.hideProjectiles()); client.setProjectilesHidden(config.hideProjectiles());
client.setDeadNPCsHidden(config.hideDeadNPCs()); client.setDeadNPCsHidden(config.hideDeadNPCs());
} }
@@ -173,44 +161,19 @@ public class EntityHiderPlugin extends Plugin
protected void shutDown() protected void shutDown()
{ {
client.setIsHidingEntities(false); client.setIsHidingEntities(false);
client.setPlayersHidden(false); client.setPlayersHidden(false);
client.setPlayersHidden2D(false); client.setPlayersHidden2D(false);
client.setFriendsHidden(false); client.setFriendsHidden(false);
client.setClanMatesHidden(false); client.setClanMatesHidden(false);
client.setLocalPlayerHidden(false); client.setLocalPlayerHidden(false);
client.setLocalPlayerHidden2D(false); client.setLocalPlayerHidden2D(false);
client.setNPCsHidden(false); client.setNPCsHidden(false);
client.setNPCsHidden2D(false); client.setNPCsHidden2D(false);
client.setPetsHidden(false); client.setPetsHidden(false);
client.setAttackersHidden(false); client.setAttackersHidden(false);
client.setProjectilesHidden(false); client.setProjectilesHidden(false);
client.setDeadNPCsHidden(false); client.setDeadNPCsHidden(false);
Text.fromCSV(config.hideNPCsNames()).forEach(client::removeHiddenNpcName); Text.fromCSV(config.hideNPCsNames()).forEach(client::removeHiddenNpcName);
Text.fromCSV(config.hideNPCsOnDeath()).forEach(client::removeHiddenNpcDeath); 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;
}
} }

19
runelite-client/src/main/java/net/runelite/client/plugins/hideunder/HideUnder.java
View File

@@ -27,7 +27,6 @@ import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.GameState; import net.runelite.api.GameState;
import net.runelite.api.Player;
import net.runelite.api.Varbits; import net.runelite.api.Varbits;
import net.runelite.api.coords.WorldPoint; import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameStateChanged;
@@ -71,7 +70,7 @@ public class HideUnder extends Plugin
{ {
if (event.getGameState() == GameState.LOGGED_IN) if (event.getGameState() == GameState.LOGGED_IN)
{ {
client.setIsHidingEntities(isPlayerRegionAllowed()); client.setIsHidingEntities(true);
} }
} }
@@ -106,20 +105,4 @@ public class HideUnder extends Plugin
} }
} }
} }
private boolean isPlayerRegionAllowed()
{
final Player localPlayer = client.getLocalPlayer();
if (localPlayer == null)
{
return true;
}
final WorldPoint playerWp = WorldPoint.fromLocalInstance(client, localPlayer.getLocalLocation());
final int playerRegionID = playerWp == null ? 0 : playerWp.getRegionID();
// 9520 = Castle Wars
return playerRegionID != 9520;
}
} }