From e0785b4f251cb9caeb9b9772e1e177fb4a6eea9c Mon Sep 17 00:00:00 2001
From: CrushedPixel <crushedpixelmaps@gmail.com>
Date: Fri, 4 Sep 2015 17:32:58 +0200
Subject: [PATCH] Don't render an Entity's nametag if it's invisible and the
 renderInvisible setting is set to false

---
 .../replaymod/mixin/MixinRendererLivingEntity.java          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/eu/crushedpixel/replaymod/mixin/MixinRendererLivingEntity.java b/src/main/java/eu/crushedpixel/replaymod/mixin/MixinRendererLivingEntity.java
index 6b6cde79..2aabf70c 100644
--- a/src/main/java/eu/crushedpixel/replaymod/mixin/MixinRendererLivingEntity.java
+++ b/src/main/java/eu/crushedpixel/replaymod/mixin/MixinRendererLivingEntity.java
@@ -19,8 +19,12 @@ public abstract class MixinRendererLivingEntity {
     private void areAllNamesHidden(EntityLivingBase entity, CallbackInfoReturnable<Boolean> ci) {
         EntityRendererHandler handler = ((EntityRendererHandler.IEntityRenderer) Minecraft.getMinecraft().entityRenderer).getHandler();
         if (handler != null && handler.getOptions().isHideNameTags()) {
+            ci.setReturnValue(false); //this calls the cancel method
+        }
+
+        if(ReplayHandler.isInReplay() && entity.isInvisible()
+                && ReplaySettings.ReplayOptions.renderInvisible.getValue() == Boolean.FALSE) {
             ci.setReturnValue(false);
-            ci.cancel();
         }
     }