Update to Minecraft 1.10

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-06-09 11:43:49 +10:00
parent 604d9373c0
commit a39b7e5f3a
161 changed files with 1176 additions and 1147 deletions

View File

@@ -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
}
}
}