summaryrefslogtreecommitdiffstats
path: root/nms-patches/WorldGenVillagePieces.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/WorldGenVillagePieces.patch')
-rw-r--r--nms-patches/WorldGenVillagePieces.patch30
1 files changed, 28 insertions, 2 deletions
diff --git a/nms-patches/WorldGenVillagePieces.patch b/nms-patches/WorldGenVillagePieces.patch
index 4c46ae38..77e049f8 100644
--- a/nms-patches/WorldGenVillagePieces.patch
+++ b/nms-patches/WorldGenVillagePieces.patch
@@ -1,8 +1,34 @@
--- a/net/minecraft/server/WorldGenVillagePieces.java
+++ b/net/minecraft/server/WorldGenVillagePieces.java
-@@ -1559,7 +1559,7 @@
+@@ -282,10 +282,10 @@
+
+ protected void a(NBTTagCompound nbttagcompound) {
+ super.a(nbttagcompound);
+- nbttagcompound.setInt("CA", Block.REGISTRY.a((Object) this.a));
+- nbttagcompound.setInt("CB", Block.REGISTRY.a((Object) this.b));
+- nbttagcompound.setInt("CC", Block.REGISTRY.a((Object) this.c));
+- nbttagcompound.setInt("CD", Block.REGISTRY.a((Object) this.d));
++ nbttagcompound.setInt("CA", Block.REGISTRY.a(this.a));
++ nbttagcompound.setInt("CB", Block.REGISTRY.a(this.b));
++ nbttagcompound.setInt("CC", Block.REGISTRY.a(this.c));
++ nbttagcompound.setInt("CD", Block.REGISTRY.a(this.d));
+ }
+
+ protected void b(NBTTagCompound nbttagcompound) {
+@@ -413,8 +413,8 @@
+
+ protected void a(NBTTagCompound nbttagcompound) {
+ super.a(nbttagcompound);
+- nbttagcompound.setInt("CA", Block.REGISTRY.a((Object) this.a));
+- nbttagcompound.setInt("CB", Block.REGISTRY.a((Object) this.b));
++ nbttagcompound.setInt("CA", Block.REGISTRY.a(this.a));
++ nbttagcompound.setInt("CB", Block.REGISTRY.a(this.b));
+ }
+
+ protected void b(NBTTagCompound nbttagcompound) {
+@@ -1602,7 +1602,7 @@
entityvillager.setPositionRotation((double) j1 + 0.5D, (double) k1, (double) l1 + 0.5D, 0.0F, 0.0F);
- entityvillager.prepare(world.E(new BlockPosition(entityvillager)), (GroupDataEntity) null);
+ entityvillager.prepare(world.D(new BlockPosition(entityvillager)), (GroupDataEntity) null);
entityvillager.setProfession(this.c(i1, entityvillager.getProfession()));
- world.addEntity(entityvillager);
+ world.addEntity(entityvillager, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CHUNK_GEN); // CraftBukkit - add SpawnReason