core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix village check 

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 c64503c66f
commit 9285b9cf1c
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 4845bcc6753c152c5e32d4257e64204cfa31b4db Mon Sep 17 00:00:00 2001 From 15bff8984584cdb609079bd13e99af4ed845243a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 5 Jun 2018 00:32:22 -0400 Date: Tue, 5 Jun 2018 00:32:22 -0400
Subject: [PATCH] Configurable Villages loading chunks for door checks Subject: [PATCH] Configurable Villages loading chunks for door checks
@ -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
@@ -297,7 +297,7 @@ public class Village { @@ -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) {
+ 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);