36 lines
1.5 KiB
Diff
36 lines
1.5 KiB
Diff
From b61f0153ccd138435700cfb4c711f477112574f6 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sat, 19 Mar 2016 15:16:54 -0400
|
|
Subject: [PATCH] Pass world to Village creation
|
|
|
|
fixes NPE bug #95
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PersistentVillage.java b/src/main/java/net/minecraft/server/PersistentVillage.java
|
|
index 98c6bbc183..7a9fb97530 100644
|
|
--- a/src/main/java/net/minecraft/server/PersistentVillage.java
|
|
+++ b/src/main/java/net/minecraft/server/PersistentVillage.java
|
|
@@ -237,7 +237,7 @@ public class PersistentVillage extends PersistentBase {
|
|
|
|
for (int i = 0; i < nbttaglist.size(); ++i) {
|
|
NBTTagCompound nbttagcompound1 = nbttaglist.getCompound(i);
|
|
- Village village = new Village();
|
|
+ Village village = new Village(world); // Paper
|
|
|
|
village.a(nbttagcompound1);
|
|
this.villages.add(village);
|
|
diff --git a/src/main/java/net/minecraft/server/Village.java b/src/main/java/net/minecraft/server/Village.java
|
|
index 68ad7bc213..b794572915 100644
|
|
--- a/src/main/java/net/minecraft/server/Village.java
|
|
+++ b/src/main/java/net/minecraft/server/Village.java
|
|
@@ -24,7 +24,7 @@ public class Village {
|
|
private final List<Village.Aggressor> k;
|
|
private int l;
|
|
|
|
- public Village() {
|
|
+ private Village() { // Paper - Nothing should call this - world needs to be set.
|
|
this.c = BlockPosition.ZERO;
|
|
this.d = BlockPosition.ZERO;
|
|
this.j = Maps.newHashMap();
|
|
--
|
|
2.21.0
|
|
|