SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.13-pre7

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2018-07-15 10:00:00 +10:00
parent d1e91a8adb
commit 7e0a66fdd5
608 changed files with 17788 additions and 9378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
paper-server/nms-patches/WorldGenVillagePieces.patch
View File

@@ -1,45 +1,19 @@
--- 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);
@@ -1662,14 +1662,14 @@
entityzombievillager.prepare(generatoraccess.getDamageScaler(new BlockPosition(entityzombievillager)), (GroupDataEntity) null, (NBTTagCompound) null);
entityzombievillager.setProfession(this.c(i1, 0));
entityzombievillager.cW();
- world.addEntity(entityzombievillager);
+ world.addEntity(entityzombievillager, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CHUNK_GEN); // CraftBukkit - add SpawnReason
entityzombievillager.di();
- generatoraccess.addEntity(entityzombievillager);
+ generatoraccess.addEntity(entityzombievillager, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CHUNK_GEN); // CraftBukkit - add SpawnReason
} else {
EntityVillager entityvillager = new EntityVillager(world);
EntityVillager entityvillager = new EntityVillager(generatoraccess.getMinecraftWorld());
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
entityvillager.setProfession(this.c(i1, generatoraccess.m().nextInt(6)));
entityvillager.a(generatoraccess.getDamageScaler(new BlockPosition(entityvillager)), (GroupDataEntity) null, (NBTTagCompound) null, false);
- generatoraccess.addEntity(entityvillager);
+ generatoraccess.addEntity(entityvillager, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CHUNK_GEN); // CraftBukkit - add SpawnReason
}
}