Update to Minecraft 1.14.4

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-07-20 09:00:00 +10:00
parent fa576e3e73
commit a4b8e8ce68
102 changed files with 678 additions and 751 deletions

View File

@@ -11,15 +11,15 @@
public class EntityZombieVillager extends EntityZombie implements VillagerDataHolder {
@@ -12,6 +16,7 @@
public UUID conversionPlayer;
private NBTTagCompound bB;
private int bC;
@@ -13,6 +17,7 @@
private NBTBase bB;
private NBTTagCompound bC;
private int bD;
+ private int lastTick = MinecraftServer.currentTick; // CraftBukkit - add field
public EntityZombieVillager(EntityTypes<? extends EntityZombieVillager> entitytypes, World world) {
super(entitytypes, world);
@@ -66,6 +71,11 @@
@@ -75,6 +80,11 @@
public void tick() {
if (!this.world.isClientSide && this.isAlive() && this.isConverting()) {
int i = this.getConversionProgress();
@@ -31,7 +31,7 @@
this.conversionTime -= i;
if (this.conversionTime <= 0) {
@@ -113,8 +123,11 @@
@@ -122,8 +132,11 @@
this.conversionPlayer = uuid;
this.conversionTime = i;
this.getDataWatcher().set(EntityZombieVillager.CONVERTING, true);
@@ -45,7 +45,7 @@
this.world.broadcastEntityEffect(this, (byte) 16);
}
@@ -133,14 +146,20 @@
@@ -146,14 +159,20 @@
entityvillager.setAgeRaw(-24000);
}
@@ -68,7 +68,7 @@
if (this.conversionPlayer != null) {
EntityHuman entityhuman = worldserver.b(this.conversionPlayer);
@@ -150,7 +169,7 @@
@@ -163,7 +182,7 @@
}
}