From 9285b9cf1ce0fd37d9e683333cbb76d974dd3c9a Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 29 Sep 2018 12:20:29 -0400 Subject: [PATCH] Fix village check obf helper was in an unimported file, so just going to skip helper here --- ...nfigurable-Villages-loading-chunks-for-door-checks.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Spigot-Server-Patches/0262-Configurable-Villages-loading-chunks-for-door-checks.patch b/Spigot-Server-Patches/0262-Configurable-Villages-loading-chunks-for-door-checks.patch index 8ef1928dc8..e755920910 100644 --- a/Spigot-Server-Patches/0262-Configurable-Villages-loading-chunks-for-door-checks.patch +++ b/Spigot-Server-Patches/0262-Configurable-Villages-loading-chunks-for-door-checks.patch @@ -1,4 +1,4 @@ -From 4845bcc6753c152c5e32d4257e64204cfa31b4db Mon Sep 17 00:00:00 2001 +From 15bff8984584cdb609079bd13e99af4ed845243a Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jun 2018 00:32:22 -0400 Subject: [PATCH] Configurable Villages loading chunks for door checks @@ -45,7 +45,7 @@ index d14a9e3a3e..0be1bf0d99 100644 public void a(NBTTagCompound nbttagcompound) { diff --git a/src/main/java/net/minecraft/server/Village.java b/src/main/java/net/minecraft/server/Village.java -index bda67faefe..1cc9096f01 100644 +index bda67faefe..0414f003a5 100644 --- a/src/main/java/net/minecraft/server/Village.java +++ b/src/main/java/net/minecraft/server/Village.java @@ -297,7 +297,7 @@ public class Village { @@ -53,7 +53,7 @@ index bda67faefe..1cc9096f01 100644 } - if (!this.g(villagedoor.d()) || Math.abs(this.g - villagedoor.h()) > 1200) { -+ if ((!this.g(villagedoor.d()) || Math.abs(this.g - villagedoor.h()) > 1200) && this.a.isLoaded(villagedoor.getPosition())) { // Paper - don't expire doors unless the chunk is loaded ++ if ((!this.g(villagedoor.d()) || Math.abs(this.g - villagedoor.h()) > 1200) && this.a.isLoaded(villagedoor.d())) { // Paper - don't expire doors unless the chunk is loaded, use same param as the first conditional and the one below checks this.c = this.c.b(villagedoor.d()); flag = true; villagedoor.a(true);