mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-05 19:25:11 +02:00
b922ff9886
This only impacted people who used our useSnapshots new API in a plugin, which obviously was no one as the data result was completely broken. Merged the NPE check patch into mine since it has to handle it too.
47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
From 86f3cd80c00f7fa9729c79ce9591fa1d3c3a44e6 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Tue, 5 Jun 2018 00:32:22 -0400
|
|
Subject: [PATCH] Don't load chunks for villager door checks
|
|
|
|
This avoids villages spam loading chunks sync
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PersistentVillage.java b/src/main/java/net/minecraft/server/PersistentVillage.java
|
|
index 01f7cee38..a3aa9f82e 100644
|
|
--- a/src/main/java/net/minecraft/server/PersistentVillage.java
|
|
+++ b/src/main/java/net/minecraft/server/PersistentVillage.java
|
|
@@ -226,7 +226,12 @@ public class PersistentVillage extends PersistentBase {
|
|
}
|
|
|
|
private boolean f(BlockPosition blockposition) {
|
|
- IBlockData iblockdata = this.world.getType(blockposition);
|
|
+ // Paper start
|
|
+ IBlockData iblockdata = this.world.getTypeIfLoaded(blockposition);
|
|
+ if (iblockdata == null) {
|
|
+ return false;
|
|
+ }
|
|
+ // 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
|
|
@@ -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;
|
|
--
|
|
2.18.0
|
|
|