fix: merge conflicts (again)

This commit is contained in:
Fireblade
2026-05-24 23:53:05 -04:00
parent d4b98cf70b
commit f005b4e485
7 changed files with 35 additions and 11 deletions

View File

@@ -147,7 +147,6 @@ GameRenderer::GameRenderer(Minecraft *mc)
this->mc = mc;
itemInHandRenderer = nullptr;
#ifndef MINECRAFT_SERVER_BUILD
// 4J-PB - set up the local players iteminhand renderers here - needs to be done with lighting enabled so that the render geometry gets compiled correctly
#ifndef MINECRAFT_SERVER_BUILD
glEnable(GL_LIGHTING);