From bda3b1078ac357b805156a8802a0649f7021716e Mon Sep 17 00:00:00 2001
From: Loki <lokirautio@gmail.com>
Date: Mon, 9 Mar 2026 06:53:08 -0500
Subject: Port over RCE Patches from LCEMP (#1023)

* LCEMP RCE Fixes WIP

Based on https://github.com/LCEMP/LCEMP/commit/d017bfc30a68888bf5c79b23cf5c4f607cf828bf

* Update to LCEMP's ByteArrayIO version

Fixes compilation since ours was missing some revisions from LCEMP

* Add additional safety checks missed in first pass

* Remove duplicate recipe count check
---
 Minecraft.Client/ServerLevel.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'Minecraft.Client/ServerLevel.cpp')

diff --git a/Minecraft.Client/ServerLevel.cpp b/Minecraft.Client/ServerLevel.cpp
index d322d9b6..a2596911 100644
--- a/Minecraft.Client/ServerLevel.cpp
+++ b/Minecraft.Client/ServerLevel.cpp
@@ -1077,7 +1077,12 @@ void ServerLevel::entityRemoved(shared_ptr<Entity> e)
 
 shared_ptr<Entity> ServerLevel::getEntity(int id)
 {
-	return entitiesById[id];
+    auto it = entitiesById.find(id);
+    if (it != entitiesById.end())
+    {
+        return it->second;
+    }
+    return nullptr;
 }
 
 bool ServerLevel::addGlobalEntity(shared_ptr<Entity> e)
-- 
cgit v1.2.3