From 814b61e64968425bda648f651a45228aa457fdf4 Mon Sep 17 00:00:00 2001 From: arsenicviscera Date: Wed, 11 Mar 2026 02:20:39 -0700 Subject: [PATCH 1/2] Name tag fixxx Co-Authored-By: Ayush Thoren --- Minecraft.Client/LivingEntityRenderer.cpp | 4 ++-- Minecraft.Client/PlayerRenderer.cpp | 9 ++++++++- Minecraft.Client/PlayerRenderer.h | 2 +- Minecraft.World/LivingEntity.cpp | 2 ++ Minecraft.World/LivingEntity.h | 2 ++ 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Minecraft.Client/LivingEntityRenderer.cpp b/Minecraft.Client/LivingEntityRenderer.cpp index b3478ba92..7a4d21b41 100644 --- a/Minecraft.Client/LivingEntityRenderer.cpp +++ b/Minecraft.Client/LivingEntityRenderer.cpp @@ -465,11 +465,11 @@ void LivingEntityRenderer::renderNameTags(shared_ptr mob, double x { if (mob->isSleeping()) { - renderNameTag(mob, msg, x, y - 1.5f, z, 64); + renderNameTag(mob, msg, x, y - 1.5f, z, 64, mob->nametagColor); } else { - renderNameTag(mob, msg, x, y, z, 64); + renderNameTag(mob, msg, x, y, z, 64, mob->nametagColor); } } diff --git a/Minecraft.Client/PlayerRenderer.cpp b/Minecraft.Client/PlayerRenderer.cpp index a9b945440..f5048011d 100644 --- a/Minecraft.Client/PlayerRenderer.cpp +++ b/Minecraft.Client/PlayerRenderer.cpp @@ -470,7 +470,7 @@ void PlayerRenderer::additionalRendering(shared_ptr _mob, float a) } } -void PlayerRenderer::renderNameTags(shared_ptr player, double x, double y, double z, wstring msg, float scale, double dist) +void PlayerRenderer::renderNameTags(shared_ptr player, double x, double y, double z, const wstring& msg, float scale, double dist) { #if 0 if (dist < 10 * 10) @@ -496,6 +496,13 @@ void PlayerRenderer::renderNameTags(shared_ptr player, double x, d } #endif + if (player->instanceof(eTYPE_PLAYER)) { + shared_ptr p = dynamic_pointer_cast(player); + p->nametagColor = getNametagColour(p->getPlayerIndex()); + } + else { + player->nametagColor = 0xFF000000; + } LivingEntityRenderer::renderNameTags(player, x, y, z, msg, scale, dist); } diff --git a/Minecraft.Client/PlayerRenderer.h b/Minecraft.Client/PlayerRenderer.h index 494ff795f..08d15a35a 100644 --- a/Minecraft.Client/PlayerRenderer.h +++ b/Minecraft.Client/PlayerRenderer.h @@ -34,7 +34,7 @@ class PlayerRenderer : public LivingEntityRenderer protected: virtual void additionalRendering(shared_ptr _mob, float a); - void renderNameTags(shared_ptr player, double x, double y, double z, wstring msg, float scale, double dist); + virtual void renderNameTags(shared_ptr player, double x, double y, double z, const wstring& msg, float scale, double dist) override; virtual void scale(shared_ptr _player, float a); public: diff --git a/Minecraft.World/LivingEntity.cpp b/Minecraft.World/LivingEntity.cpp index 3ace88068..0912a7ba7 100644 --- a/Minecraft.World/LivingEntity.cpp +++ b/Minecraft.World/LivingEntity.cpp @@ -93,6 +93,8 @@ void LivingEntity::_init() speed = 0.0f; noJumpDelay = 0; absorptionAmount = 0.0f; + + nametagColor = 0; } LivingEntity::LivingEntity( Level* level) : Entity(level) diff --git a/Minecraft.World/LivingEntity.h b/Minecraft.World/LivingEntity.h index ecc819df9..87598f476 100644 --- a/Minecraft.World/LivingEntity.h +++ b/Minecraft.World/LivingEntity.h @@ -80,6 +80,8 @@ class LivingEntity : public Entity float yHeadRot, yHeadRotO; float flyingSpeed; + int nametagColor; + protected: shared_ptr lastHurtByPlayer; int lastHurtByPlayerTime; From 7b3f0cfdab664605e444ad5668b45d07dffcba9f Mon Sep 17 00:00:00 2001 From: arsenicviscera Date: Wed, 11 Mar 2026 02:28:38 -0700 Subject: [PATCH 2/2] Fixed default Co-Authored-By: Ayush Thoren --- Minecraft.World/LivingEntity.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Minecraft.World/LivingEntity.cpp b/Minecraft.World/LivingEntity.cpp index 0912a7ba7..39449f19c 100644 --- a/Minecraft.World/LivingEntity.cpp +++ b/Minecraft.World/LivingEntity.cpp @@ -94,7 +94,7 @@ void LivingEntity::_init() noJumpDelay = 0; absorptionAmount = 0.0f; - nametagColor = 0; + nametagColor = 0xFF000000; //default to black. Overridden by stuff } LivingEntity::LivingEntity( Level* level) : Entity(level)