From a14a4542c9a1d475c5bbb3f9ff6bf80be43e680a Mon Sep 17 00:00:00 2001 From: Ayush Thoren Date: Sun, 8 Mar 2026 12:12:49 -0700 Subject: Fix stale held item appearing when switching worlds (#910) Signed-off-by: Ayush Thoren --- Minecraft.Client/Minecraft.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'Minecraft.Client/Minecraft.cpp') diff --git a/Minecraft.Client/Minecraft.cpp b/Minecraft.Client/Minecraft.cpp index 599a14f2..1fc8bd54 100644 --- a/Minecraft.Client/Minecraft.cpp +++ b/Minecraft.Client/Minecraft.cpp @@ -10,6 +10,7 @@ #include "User.h" #include "Textures.h" #include "GameRenderer.h" +#include "ItemInHandRenderer.h" #include "HumanoidModel.h" #include "Options.h" #include "TexturePackRepository.h" @@ -217,6 +218,7 @@ Minecraft::Minecraft(Component *mouseComponent, Canvas *parent, MinecraftApplet m_pendingLocalConnections[i] = NULL; m_connectionFailed[i] = false; localgameModes[i]=NULL; + localitemInHandRenderers[i] = NULL; } animateTickLevel = NULL; // 4J added @@ -4240,6 +4242,17 @@ void Minecraft::setLevel(MultiPlayerLevel *level, int message /*=-1*/, shared_pt // 4J - stop update thread from processing this level, which blocks until it is safe to move on - will be re-enabled if we set the level to be non-NULL gameRenderer->DisableUpdateThread(); + if (level == NULL || player == NULL) + { + for (int i = 0; i < XUSER_MAX_COUNT; ++i) + { + if (localitemInHandRenderers[i] != NULL) + { + localitemInHandRenderers[i]->reset(); + } + } + } + for(unsigned int i = 0; i < levels.length; ++i) { // 4J We only need to save out in multiplayer is we are setting the level to NULL -- cgit v1.2.3