From febfd5ab62f0d0ced4d8d7ae3de575fac8af6f32 Mon Sep 17 00:00:00 2001
From: Max Becker <dev@maxgb.de>
Date: Fri, 15 Oct 2021 05:09:16 +0200
Subject: [PATCH] Fix Entity#onAddedToWorld not being called for non-player
 entities server-side (#8134)

---
 .../minecraft/server/level/ServerLevel.java.patch  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/patches/minecraft/net/minecraft/server/level/ServerLevel.java.patch b/patches/minecraft/net/minecraft/server/level/ServerLevel.java.patch
index e333c9d821..653b5643d3 100644
--- a/patches/minecraft/net/minecraft/server/level/ServerLevel.java.patch
+++ b/patches/minecraft/net/minecraft/server/level/ServerLevel.java.patch
@@ -156,6 +156,20 @@
     }
  
     private boolean m_8872_(Entity p_8873_) {
+@@ -754,7 +_,12 @@
+          f_8566_.warn("Tried to add entity {} but it was marked as removed already", (Object)EntityType.m_20613_(p_8873_.m_6095_()));
+          return false;
+       } else {
+-         return this.f_143244_.m_157533_(p_8873_);
++         if (this.f_143244_.m_157533_(p_8873_)) {
++            p_8873_.onAddedToWorld();
++            return true;
++         } else {
++            return false;
++         }
+       }
+    }
+ 
 @@ -790,10 +_,20 @@
     }