PaperMC/Spigot-Server-Patches/0077-Pass-world-to-Village-creation.patch

37 lines
1.5 KiB
Diff
Raw Normal View History

From 7cb360d7aec57c15e7ce8b669d28fd9de086ffc3 Mon Sep 17 00:00:00 2001
2016-03-19 20:21:39 +01:00
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 a5b79ecad..01f7cee38 100644
2016-03-19 20:21:39 +01:00
--- a/src/main/java/net/minecraft/server/PersistentVillage.java
+++ b/src/main/java/net/minecraft/server/PersistentVillage.java
2016-11-17 03:23:38 +01:00
@@ -238,7 +238,7 @@ public class PersistentVillage extends PersistentBase {
2016-03-19 20:21:39 +01:00
for (int i = 0; i < nbttaglist.size(); ++i) {
NBTTagCompound nbttagcompound1 = nbttaglist.get(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 2ab381d50..817c836c3 100644
2016-03-19 20:21:39 +01:00
--- a/src/main/java/net/minecraft/server/Village.java
+++ b/src/main/java/net/minecraft/server/Village.java
2016-11-17 03:23:38 +01:00
@@ -24,7 +24,7 @@ public class Village {
2016-06-09 05:57:14 +02:00
private final List<Village.Aggressor> k;
2016-03-19 20:21:39 +01:00
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;
2016-11-17 03:23:38 +01:00
this.j = Maps.newHashMap();
2016-03-19 20:21:39 +01:00
--
2.12.2.windows.2
2016-03-19 20:21:39 +01:00