Merge branch 'smartcmd:main' into main

1 files changed, 9 insertions, 3 deletions

diff --git a/Minecraft.Client/EntityRenderDispatcher.cpp b/Minecraft.Client/EntityRenderDispatcher.cpp
index 5bb98ead..01972e56 100644
--- a/Minecraft.Client/EntityRenderDispatcher.cpp
+++ b/Minecraft.Client/EntityRenderDispatcher.cpp
@@ -87,7 +87,7 @@ double EntityRenderDispatcher::xOff = 0.0;
 double EntityRenderDispatcher::yOff = 0.0;
 double EntityRenderDispatcher::zOff = 0.0;
 
-EntityRenderDispatcher *EntityRenderDispatcher::instance = NULL;
+EntityRenderDispatcher *EntityRenderDispatcher::instance = nullptr;
 
 void EntityRenderDispatcher::staticCtor()
 {
@@ -222,7 +222,7 @@ void EntityRenderDispatcher::prepare(Level *level, Textures *textures, Font *fon
 			int data = level->getData(Mth::floor(player->x), Mth::floor(player->y), Mth::floor(player->z));
 
 			int direction = data & 3;
-			playerRotY = (float)(direction * 90 + 180);
+			playerRotY = static_cast<float>(direction * 90 + 180);
 			playerRotX = 0;
 		}
 	} else {
@@ -234,6 +234,7 @@ void EntityRenderDispatcher::prepare(Level *level, Textures *textures, Font *fon
 	if (pl->ThirdPersonView() == 2)
 	{
 		playerRotY += 180;
+		playerRotX = -playerRotX;
 	}
 
 	xPlayer = player->xOld + (player->x - player->xOld) * a;
@@ -244,6 +245,11 @@ void EntityRenderDispatcher::prepare(Level *level, Textures *textures, Font *fon
 
 void EntityRenderDispatcher::render(shared_ptr<Entity> entity, float a)
 {
+	if (entity == nullptr)
+	{
+		return;
+	}
+
 	double x = entity->xOld + (entity->x - entity->xOld) * a;
 	double y = entity->yOld + (entity->y - entity->yOld) * a;
 	double z = entity->zOld + (entity->z - entity->zOld) * a;
@@ -280,7 +286,7 @@ void EntityRenderDispatcher::render(shared_ptr<Entity> entity, float a)
 void EntityRenderDispatcher::render(shared_ptr<Entity> entity, double x, double y, double z, float rot, float a, bool bItemFrame, bool bRenderPlayerShadow)
 {
 	EntityRenderer *renderer = getRenderer(entity);
-	if (renderer != NULL)
+	if (renderer != nullptr)
 	{	
 		renderer->SetItemFrame(bItemFrame);