Paper/nms-patches/WorldGenVillagePieces.patch
2016-11-17 12:41:03 +11:00

46 lines
2.6 KiB
Diff

--- a/net/minecraft/server/WorldGenVillagePieces.java
+++ b/net/minecraft/server/WorldGenVillagePieces.java
@@ -238,10 +238,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 a(NBTTagCompound nbttagcompound, DefinedStructureManager definedstructuremanager) {
@@ -371,8 +371,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 a(NBTTagCompound nbttagcompound, DefinedStructureManager definedstructuremanager) {
@@ -1672,14 +1672,14 @@
entityzombievillager.prepare(world.D(new BlockPosition(entityzombievillager)), (GroupDataEntity) null);
entityzombievillager.setProfession(this.c(i1, 0));
entityzombievillager.cS();
- world.addEntity(entityzombievillager);
+ world.addEntity(entityzombievillager, 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.setProfession(this.c(i1, world.random.nextInt(6)));
entityvillager.a(world.D(new BlockPosition(entityvillager)), (GroupDataEntity) null, false);
- world.addEntity(entityvillager);
+ world.addEntity(entityvillager, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CHUNK_GEN); // CraftBukkit - add SpawnReason
}
}