backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-20 16:42:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #137 from MathiewMay/dev

Browse source 
Added nullptr check on itemInHandRenderer to prevent an seg fault.
This commit is contained in:
Leah Anderson 2026-03-09 12:14:55 -06:00 committed by GitHub
parent 5f3ae12d16 3f1c95418f
commit 9c996b6014
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Minecraft.Client/Rendering/GameRenderer.cpp
View file

@ -777,11 +777,14 @@ void GameRenderer::renderItemInHand(float a, int eye)
{
if (!mc->options->hideGui && !mc->gameMode->isCutScene())
{
turnOnLightLayer(a);
//turnOnLightLayer(a); // disable light layer on handrenderer similarly to how it was done on the chunk render (this makes the hand look proper)
PIXBeginNamedEvent(0,"Item in hand render");
itemInHandRenderer->render(a);
// add null pointer check to itemInHandRenderer to prevent a occasional seg fault
if (itemInHandRenderer != nullptr) {
itemInHandRenderer->render(a);
}
PIXEndNamedEvent();
turnOffLightLayer(a);
//turnOffLightLayer(a); // disable light layer on handrenderer similarly to how it was done on the chunk render (this makes the hand look proper)
}
}
glPopMatrix();
@ -789,7 +792,10 @@ void GameRenderer::renderItemInHand(float a, int eye)
//if (!mc->options->thirdPersonView && !mc->cameraTargetPlayer->isSleeping())
if (!localplayer->ThirdPersonView() && !mc->cameraTargetPlayer->isSleeping())
{
itemInHandRenderer->renderScreenEffect(a);
// add null pointer check to itemInHandRenderer to prevent a occasional seg fault
if (itemInHandRenderer != nullptr) {
itemInHandRenderer->renderScreenEffect(a);
}
bobHurt(a);
}
// 4J-PB - changing this to be per player