Update to Minecraft 1.14.1

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-05-14 10:00:00 +10:00
parent 1825747f6d
commit 788fd7eedc
60 changed files with 322 additions and 587 deletions

View File

@@ -19,7 +19,7 @@
public EntityZombieVillager(EntityTypes<? extends EntityZombieVillager> entitytypes, World world) {
super(entitytypes, world);
@@ -68,6 +73,11 @@
@@ -66,6 +71,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) {
@@ -115,8 +125,11 @@
@@ -113,8 +123,11 @@
this.conversionPlayer = uuid;
this.conversionTime = i;
this.getDataWatcher().set(EntityZombieVillager.CONVERTING, true);
@@ -45,7 +45,7 @@
this.world.broadcastEntityEffect(this, (byte) 16);
}
@@ -135,14 +148,20 @@
@@ -133,14 +146,20 @@
entityvillager.setAgeRaw(-24000);
}
@@ -68,12 +68,12 @@
if (this.conversionPlayer != null) {
EntityHuman entityhuman = worldserver.b(this.conversionPlayer);
@@ -152,7 +171,7 @@
@@ -150,7 +169,7 @@
}
}
- entityvillager.addEffect(new MobEffect(MobEffects.CONFUSION, 200, 0));
+ entityvillager.addEffect(new MobEffect(MobEffects.CONFUSION, 200, 0), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.CONVERSION); // CraftBukkit
worldserver.a((EntityHuman) null, 1027, new BlockPosition((int) this.locX, (int) this.locY, (int) this.locZ), 0);
worldserver.a((EntityHuman) null, 1027, new BlockPosition(this), 0);
}