fix: 修复隐身nametag可见的bug

close #32
FPSMasterTeam · Aug 24, 2024 · afdbc37 · afdbc37
1 parent 3f3257f
commit afdbc37
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/v1.12.2/src/main/java/top/fpsmaster/forge/mixin/MixinRenderLivingBase.java b/v1.12.2/src/main/java/top/fpsmaster/forge/mixin/MixinRenderLivingBase.java
@@ -1,5 +1,7 @@
 package top.fpsmaster.forge.mixin;
 
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.renderer.GLAllocation;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.OpenGlHelper;
@@ -22,7 +24,10 @@ public abstract class MixinRenderLivingBase {
     @Inject(method = "canRenderName(Lnet/minecraft/entity/EntityLivingBase;)Z", at = @At("HEAD"), cancellable = true)
     public void tag(EntityLivingBase entity, CallbackInfoReturnable<Boolean> cir) {
         if (LevelTag.using && LevelTag.showSelf.getValue()) {
-            cir.setReturnValue(true);
+            EntityPlayerSP entityplayersp = Minecraft.getMinecraft().player;
+            boolean flag = !entity.isInvisibleToPlayer(entityplayersp);
+
+            cir.setReturnValue(flag);
         }
     }
 

diff --git a/v1.8.9/src/main/java/top/fpsmaster/forge/mixin/MixinRenderLivingBase.java b/v1.8.9/src/main/java/top/fpsmaster/forge/mixin/MixinRenderLivingBase.java
@@ -1,5 +1,7 @@
 package top.fpsmaster.forge.mixin;
 
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.entity.RendererLivingEntity;
@@ -22,7 +24,10 @@ public abstract class MixinRenderLivingBase {
     @Inject(method = "canRenderName(Lnet/minecraft/entity/EntityLivingBase;)Z", at = @At("HEAD"), cancellable = true)
     public void tag(EntityLivingBase entity, CallbackInfoReturnable<Boolean> cir) {
         if (LevelTag.using && LevelTag.showSelf.getValue()) {
-            cir.setReturnValue(true);
+            EntityPlayerSP entityplayersp = Minecraft.getMinecraft().thePlayer;
+            boolean flag = !entity.isInvisibleToPlayer(entityplayersp);
+
+            cir.setReturnValue(flag);
         }
     }