From 1121f18413debd0825af937a4df04d8535d780b4 Mon Sep 17 00:00:00 2001 From: Take Weiland Date: Sat, 17 Jul 2021 04:24:29 +0200 Subject: [PATCH] Fix entities losing their scoreboard data when they are unloaded (#7826) --- .../net/minecraft/world/server/ServerWorld.java.patch | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/patches/minecraft/net/minecraft/world/server/ServerWorld.java.patch b/patches/minecraft/net/minecraft/world/server/ServerWorld.java.patch index ff58463e86..a1d2e838d8 100644 --- a/patches/minecraft/net/minecraft/world/server/ServerWorld.java.patch +++ b/patches/minecraft/net/minecraft/world/server/ServerWorld.java.patch @@ -140,7 +140,7 @@ this.func_217465_m(p_217440_1_); return true; } -@@ -879,12 +_,17 @@ +@@ -879,10 +_,14 @@ } @@ -157,15 +157,13 @@ + enderdragonpartentity.remove(keepData); } } -+ p_217484_1_.remove(keepData); - this.field_175741_N.remove(p_217484_1_.func_110124_au()); - this.func_72863_F().func_217226_b(p_217484_1_); -@@ -898,6 +_,8 @@ +@@ -898,6 +_,9 @@ this.field_217495_I.remove(((MobEntity)p_217484_1_).func_70661_as()); } + p_217484_1_.onRemovedFromWorld(); ++ p_217484_1_.remove(keepData); + net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.entity.EntityLeaveWorldEvent(p_217484_1_, this)); }