LegacyConsole/4jcraft
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-06-20 18:15:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into refactor/untangle-assets-mess

Browse Source
This commit is contained in:
Tropical
2026-03-09 01:20:45 -05:00
parent e571795e99 cbac41b152
commit 4be19958ea
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Minecraft.Client/Platform/Common/Consoles_App.cpp
View File

@@ -630,7 +630,11 @@ void CMinecraftApp::InitGameSettings()
C4JStorage::PROFILESETTINGS *pProfileSettings=StorageManager.GetDashboardProfileSettings(i);
// 4J-PB - don't cause an options write to happen here
SetDefaultOptions(pProfileSettings,i,false);
#else
// Linux (and any other platform): profile data is zero-initialised, so explicitly apply defaults
C_4JProfile::PROFILESETTINGS *pProfileSettings=ProfileManager.GetDashboardProfileSettings(i);
memset(pProfileSettings,0,sizeof(C_4JProfile::PROFILESETTINGS));
SetDefaultOptions(pProfileSettings,i);
#endif
}
}

2
Minecraft.Client/Rendering/EntityRenderers/ItemInHandRenderer.cpp
View File

@@ -311,6 +311,8 @@ void ItemInHandRenderer::renderItem3D(Tesselator *t, float u0, float v0, float u
void ItemInHandRenderer::render(float a)
{
if (!mc->player || !mc->level) return;
float h = oHeight + (height - oHeight) * a;
std::shared_ptr<Player> player = mc->player;