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

Fix another case where villages load chunks

This commit is contained in:
Aikar 2018-06-21 22:58:09 -04:00
parent 9b1e9b43ff
commit f0cb089a24
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Spigot-Server-Patches/0300-Don-t-load-chunks-for-villager-door-checks.patch
View File

@ -1,4 +1,4 @@
From 8159283895fa3fc65c9d1ab0d3e1ad67a1c9fe9c Mon Sep 17 00:00:00 2001 From 9b8e555364e4a6273adc5c2c22f8f98a6fbf087e 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] Don't load chunks for villager door checks Subject: [PATCH] Don't load chunks for villager door checks
@ -22,6 +22,24 @@ index 01f7cee38..a3aa9f82e 100644
+ // Paper end + // Paper end
Block block = iblockdata.getBlock(); Block block = iblockdata.getBlock();
return block instanceof BlockDoor ? iblockdata.getMaterial() == Material.WOOD : false;
diff --git a/src/main/java/net/minecraft/server/Village.java b/src/main/java/net/minecraft/server/Village.java
index 2eb33a986..9f1867ddd 100644
--- a/src/main/java/net/minecraft/server/Village.java
+++ b/src/main/java/net/minecraft/server/Village.java
@@ -327,7 +327,12 @@ public class Village {
}
private boolean f(BlockPosition blockposition) {
- IBlockData iblockdata = this.a.getType(blockposition);
+ // Paper start
+ IBlockData iblockdata = this.a.getTypeIfLoaded(blockposition);
+ if (iblockdata == null) {
+ return false;
+ }
+ // Paper end
Block block = iblockdata.getBlock();
return block instanceof BlockDoor ? iblockdata.getMaterial() == Material.WOOD : false; return block instanceof BlockDoor ? iblockdata.getMaterial() == Material.WOOD : false;
-- --
2.17.1 2.17.1