Fixed NameTags Bots option making a confirmed bot's name tag disappea…

…r instead of having the default tag when disabled. (CCBlueX#1306)
mems01 · Sep 10, 2023 · b53914a · b53914a
1 parent f8750e3
commit b53914a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/render/NameTags.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/render/NameTags.kt
@@ -22,6 +22,7 @@ import net.ccbluex.liquidbounce.utils.render.RenderUtils.quickDrawRect
 import net.ccbluex.liquidbounce.utils.render.RenderUtils.resetCaps
 import net.ccbluex.liquidbounce.value.*
 import net.minecraft.client.renderer.GlStateManager.*
+import net.minecraft.entity.Entity
 import net.minecraft.entity.EntityLivingBase
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.potion.Potion
@@ -303,4 +304,9 @@ object NameTags : Module("NameTags", ModuleCategory.RENDER) {
 
         return prefix + "§c " + (if (healthInInt) result.toInt() else decimalFormat.format(result)) + suffix
     }
+
+    fun shouldRenderNameTags(entity: Entity) =
+        state && entity is EntityLivingBase && (ESP.state && ESP.renderNameTags || isSelected(entity, false) && (!isBot(
+            entity
+        ) || bot))
 }
diff --git a/...ava/net/ccbluex/liquidbounce/injection/forge/mixins/render/MixinRendererLivingEntity.java b/...ava/net/ccbluex/liquidbounce/injection/forge/mixins/render/MixinRendererLivingEntity.java
@@ -60,7 +60,7 @@ private <T extends EntityLivingBase> void injectChamsPost(T entity, double x, do
 
     @Inject(method = "canRenderName(Lnet/minecraft/entity/EntityLivingBase;)Z", at = @At("HEAD"), cancellable = true)
     private <T extends EntityLivingBase> void canRenderName(T entity, CallbackInfoReturnable<Boolean> callbackInfoReturnable) {
-        if (!ESP.INSTANCE.getRenderNameTags() || (NameTags.INSTANCE.getState() && EntityUtils.INSTANCE.isSelected(entity, false))) {
+        if (NameTags.INSTANCE.shouldRenderNameTags(entity)) {
             callbackInfoReturnable.setReturnValue(false);
         }
     }