From 6b198b5cfef8db8ad281e9b51a0d8bd1bc7535c2 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 21 Jun 2018 22:58:09 -0400
Subject: [PATCH] Fix another case where villages load chunks
---
...-load-chunks-for-villager-door-checks.patch | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/Spigot-Server-Patches/Don-t-load-chunks-for-villager-door-checks.patch b/Spigot-Server-Patches/Don-t-load-chunks-for-villager-door-checks.patch
index 36591417e3..aa6c36b8e6 100644
--- a/Spigot-Server-Patches/Don-t-load-chunks-for-villager-door-checks.patch
+++ b/Spigot-Server-Patches/Don-t-load-chunks-for-villager-door-checks.patch
@@ -22,5 +22,23 @@ index 01f7cee38..a3aa9f82e 100644
+ // Paper end
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
+@@ -0,0 +0,0 @@ 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;
--
\ No newline at end of file