From 5224533d45ad820121deb09f2419b8680f7b5f3b Mon Sep 17 00:00:00 2001 From: sciwhiz12 Date: Tue, 4 Aug 2020 08:12:26 +0800 Subject: [PATCH] Fix misaligned patch for ServerWorld#updateEntity Fixes #6516 (#7210) --- .../net/minecraft/world/server/ServerWorld.java.patch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/patches/minecraft/net/minecraft/world/server/ServerWorld.java.patch b/patches/minecraft/net/minecraft/world/server/ServerWorld.java.patch index b56797eb31..6229ea1a5b 100644 --- a/patches/minecraft/net/minecraft/world/server/ServerWorld.java.patch +++ b/patches/minecraft/net/minecraft/world/server/ServerWorld.java.patch @@ -143,17 +143,18 @@ i += this.field_73012_v.nextInt(8) - this.field_73012_v.nextInt(8); j += this.field_73012_v.nextInt(8) - this.field_73012_v.nextInt(8); ++k; -@@ -584,8 +593,9 @@ +@@ -584,9 +593,10 @@ ++p_217479_1_.field_70173_aa; IProfiler iprofiler = this.func_217381_Z(); iprofiler.func_194340_a(() -> { - return Registry.field_212629_r.func_177774_c(p_217479_1_.func_200600_R()).toString(); + return p_217479_1_.func_200600_R().getRegistryName() == null ? p_217479_1_.func_200600_R().toString() : p_217479_1_.func_200600_R().getRegistryName().toString(); }); -+ if (p_217479_1_.canUpdate()) iprofiler.func_230035_c_("tickNonPassenger"); ++ if (p_217479_1_.canUpdate()) p_217479_1_.func_70071_h_(); iprofiler.func_76319_b(); + } @@ -652,6 +662,11 @@ }