splatink/MinecraftConsoles
1
0
Fork 0
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-03-25 14:21:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix stale held item appearing when switching worlds (#910)

Browse Source 
Signed-off-by: Ayush Thoren <ayushthoren@gmail.com>
This commit is contained in:
Ayush Thoren
2026-03-08 12:12:49 -07:00
committed by GitHub
parent 2f443fe333
commit a14a4542c9
3 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Minecraft.Client/ItemInHandRenderer.cpp
View File

@@ -930,6 +930,14 @@ void ItemInHandRenderer::tick()
} }
void ItemInHandRenderer::reset()
{
selectedItem = nullptr;
lastSlot = -1;
height = 0.0f;
oHeight = 0.0f;
}
void ItemInHandRenderer::itemPlaced() void ItemInHandRenderer::itemPlaced()
{ {
height = 0; height = 0;

1
Minecraft.Client/ItemInHandRenderer.h
View File

@@ -41,6 +41,7 @@ private:
int lastSlot; int lastSlot;
public: public:
void tick(); void tick();
void reset();
void itemPlaced(); void itemPlaced();
void itemUsed(); void itemUsed();
}; };

13
Minecraft.Client/Minecraft.cpp
View File

@@ -10,6 +10,7 @@
#include "User.h" #include "User.h"
#include "Textures.h" #include "Textures.h"
#include "GameRenderer.h" #include "GameRenderer.h"
#include "ItemInHandRenderer.h"
#include "HumanoidModel.h" #include "HumanoidModel.h"
#include "Options.h" #include "Options.h"
#include "TexturePackRepository.h" #include "TexturePackRepository.h"
@@ -217,6 +218,7 @@ Minecraft::Minecraft(Component *mouseComponent, Canvas *parent, MinecraftApplet
m_pendingLocalConnections[i] = NULL; m_pendingLocalConnections[i] = NULL;
m_connectionFailed[i] = false; m_connectionFailed[i] = false;
localgameModes[i]=NULL; localgameModes[i]=NULL;
localitemInHandRenderers[i] = NULL;
} }
animateTickLevel = NULL; // 4J added 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 // 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(); 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) 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 // 4J We only need to save out in multiplayer is we are setting the level to NULL