summaryrefslogtreecommitdiffstats
path: root/nms-patches/WorldGenVillagePieces.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-06-09 11:43:49 +1000
committermd_5 <git@md-5.net>2016-06-09 11:43:49 +1000
commita8a4bedd2a9ef3c192ecf76db9afaf0b784ed08d (patch)
tree9efb0ce242b802a188032bd500ef7afaf29032a3 /nms-patches/WorldGenVillagePieces.patch
parent0cd0397a8295992112ad3bf0d37795a04d22503e (diff)
downloadcraftbukkit-a8a4bedd2a9ef3c192ecf76db9afaf0b784ed08d.tar
craftbukkit-a8a4bedd2a9ef3c192ecf76db9afaf0b784ed08d.tar.gz
craftbukkit-a8a4bedd2a9ef3c192ecf76db9afaf0b784ed08d.tar.lz
craftbukkit-a8a4bedd2a9ef3c192ecf76db9afaf0b784ed08d.tar.xz
craftbukkit-a8a4bedd2a9ef3c192ecf76db9afaf0b784ed08d.zip
Update to Minecraft 1.10
Diffstat (limited to 'nms-patches/WorldGenVillagePieces.patch')
-rw-r--r--nms-patches/WorldGenVillagePieces.patch26
1 files changed, 17 insertions, 9 deletions
diff --git a/nms-patches/WorldGenVillagePieces.patch b/nms-patches/WorldGenVillagePieces.patch
index 77e049f8..021d1768 100644
--- a/nms-patches/WorldGenVillagePieces.patch
+++ b/nms-patches/WorldGenVillagePieces.patch
@@ -1,6 +1,6 @@
--- a/net/minecraft/server/WorldGenVillagePieces.java
+++ b/net/minecraft/server/WorldGenVillagePieces.java
-@@ -282,10 +282,10 @@
+@@ -269,10 +269,10 @@
protected void a(NBTTagCompound nbttagcompound) {
super.a(nbttagcompound);
@@ -15,7 +15,7 @@
}
protected void b(NBTTagCompound nbttagcompound) {
-@@ -413,8 +413,8 @@
+@@ -402,8 +402,8 @@
protected void a(NBTTagCompound nbttagcompound) {
super.a(nbttagcompound);
@@ -26,12 +26,20 @@
}
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.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
+@@ -1701,14 +1701,14 @@
+ entityzombie.prepare(world.D(new BlockPosition(entityzombie)), (GroupDataEntity) null);
+ entityzombie.setVillagerType(EnumZombieType.b(this.c(i1, 0)));
+ entityzombie.cQ();
+- world.addEntity(entityzombie);
++ world.addEntity(entityzombie, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CHUNK_GEN); // CraftBukkit - add SpawnReason
+ } else {
+ EntityVillager entityvillager = new EntityVillager(world);
+
+ entityvillager.setPositionRotation((double) j1 + 0.5D, (double) k1, (double) l1 + 0.5D, 0.0F, 0.0F);
+ 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
+ }
}
- }