From 7c46259f546ad91397598eac70875aed6d5657a1 Mon Sep 17 00:00:00 2001 From: CrushedPixel Date: Mon, 29 Jun 2015 15:44:01 +0200 Subject: [PATCH] Does not render Players at all if they're invisible (e.g. Spectator Mode) - resolving https://trello.com/c/Hy1NaAKu/ Does not render crosshair if hovering over invisible players --- .../replaymod/events/handlers/SpectatingHandler.java | 2 +- .../eu/crushedpixel/replaymod/renderer/InvisibilityRender.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/eu/crushedpixel/replaymod/events/handlers/SpectatingHandler.java b/src/main/java/eu/crushedpixel/replaymod/events/handlers/SpectatingHandler.java index 936f6df4..ae310ec8 100644 --- a/src/main/java/eu/crushedpixel/replaymod/events/handlers/SpectatingHandler.java +++ b/src/main/java/eu/crushedpixel/replaymod/events/handlers/SpectatingHandler.java @@ -11,6 +11,6 @@ public class SpectatingHandler { private static Minecraft mc = Minecraft.getMinecraft(); public static boolean canSpectate(Entity e) { - return ((e instanceof EntityPlayer || e instanceof EntityLiving || e instanceof EntityItemFrame) && e != mc.thePlayer); + return ((e instanceof EntityPlayer || e instanceof EntityLiving || e instanceof EntityItemFrame) && e != mc.thePlayer && !e.isInvisible()); } } diff --git a/src/main/java/eu/crushedpixel/replaymod/renderer/InvisibilityRender.java b/src/main/java/eu/crushedpixel/replaymod/renderer/InvisibilityRender.java index a61dd5af..4b661f14 100644 --- a/src/main/java/eu/crushedpixel/replaymod/renderer/InvisibilityRender.java +++ b/src/main/java/eu/crushedpixel/replaymod/renderer/InvisibilityRender.java @@ -20,7 +20,7 @@ public class InvisibilityRender extends RenderPlayer { @Override public boolean shouldRender(Entity entity, ICamera camera, double camX, double camY, double camZ) { - if(PlayerHandler.isHidden(entity.getUniqueID()) || + if(PlayerHandler.isHidden(entity.getUniqueID()) || entity.isInvisible() || (ReplayHandler.isInReplay() && entity == Minecraft.getMinecraft().thePlayer)) return false; return super.shouldRender(entity, camera, camX, camY, camZ); }