Merge pull request #1943 from Kamielvf/entity-hider-fix

Fix issue where hiding local player would not hide you when in clan
This commit is contained in:
Tomas Slusny
2018-04-26 09:03:32 +02:00
committed by GitHub

View File

@@ -112,8 +112,9 @@ public abstract class EntityHiderMixin implements RSRegion
{ {
boolean local = drawingUI ? hideLocalPlayer2D : hideLocalPlayer; boolean local = drawingUI ? hideLocalPlayer2D : hideLocalPlayer;
boolean other = drawingUI ? hidePlayers2D : hidePlayers; boolean other = drawingUI ? hidePlayers2D : hidePlayers;
boolean isLocalPlayer = renderable == client.getLocalPlayer();
if (renderable == client.getLocalPlayer() ? local : other) if (isLocalPlayer ? local : other)
{ {
RSPlayer player = (RSPlayer) renderable; RSPlayer player = (RSPlayer) renderable;
@@ -125,7 +126,7 @@ public abstract class EntityHiderMixin implements RSRegion
} }
} }
return (!hideFriends && player.isFriend()) || (!hideClanMates && player.isClanMember()); return (!hideFriends && player.isFriend()) || (!isLocalPlayer && !hideClanMates && player.isClanMember());
} }
} }
else if (renderable instanceof RSNPC) else if (renderable instanceof RSNPC)