SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix village check

Browse Source 
obf helper was in an unimported file, so just going to skip helper here
This commit is contained in:
Aikar
2018-09-29 12:20:29 -04:00
parent b3416da15e
commit 5ced56f8d2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-Server-Patches/Configurable-Villages-loading-chunks-for-door-checks.patch
View File

@@ -45,7 +45,7 @@ index d14a9e3a3e..0be1bf0d99 100644
public void a(NBTTagCompound nbttagcompound) { 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 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 --- a/src/main/java/net/minecraft/server/Village.java
+++ b/src/main/java/net/minecraft/server/Village.java +++ b/src/main/java/net/minecraft/server/Village.java
@@ -0,0 +0,0 @@ public class Village { @@ -0,0 +0,0 @@ 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) {
+ 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()); this.c = this.c.b(villagedoor.d());
flag = true; flag = true;
villagedoor.a(true); villagedoor.a(true);