2016-11-17 02:41:03 +01:00
|
|
|
--- a/net/minecraft/server/EntityZombieVillager.java
|
|
|
|
|
+++ b/net/minecraft/server/EntityZombieVillager.java
|
2017-05-14 04:00:00 +02:00
|
|
|
@@ -9,6 +9,7 @@
|
2018-07-15 02:00:00 +02:00
|
|
|
private static final DataWatcherObject<Integer> b = DataWatcher.a(EntityZombieVillager.class, DataWatcherRegistry.b);
|
2016-11-17 02:41:03 +01:00
|
|
|
private int conversionTime;
|
2018-07-15 02:00:00 +02:00
|
|
|
private UUID bD;
|
2016-11-17 02:41:03 +01:00
|
|
|
+ private int lastTick = MinecraftServer.currentTick; // CraftBukkit - add field
|
|
|
|
|
|
|
|
|
|
public EntityZombieVillager(World world) {
|
2018-07-15 02:00:00 +02:00
|
|
|
super(EntityTypes.ZOMBIE_VILLAGER, world);
|
|
|
|
|
@@ -56,6 +57,11 @@
|
|
|
|
|
public void tick() {
|
2016-11-17 02:41:03 +01:00
|
|
|
if (!this.world.isClientSide && this.isConverting()) {
|
2018-08-26 04:00:00 +02:00
|
|
|
int i = this.dK();
|
2016-11-17 02:41:03 +01:00
|
|
|
+ // CraftBukkit start - Use wall time instead of ticks for villager conversion
|
|
|
|
|
+ int elapsedTicks = MinecraftServer.currentTick - this.lastTick;
|
|
|
|
|
+ this.lastTick = MinecraftServer.currentTick;
|
|
|
|
|
+ i *= elapsedTicks;
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
|
|
|
|
|
this.conversionTime -= i;
|
|
|
|
|
if (this.conversionTime <= 0) {
|
2018-07-20 08:04:37 +02:00
|
|
|
@@ -100,8 +106,10 @@
|
|
|
|
|
this.bD = uuid;
|
|
|
|
|
this.conversionTime = i;
|
|
|
|
|
this.getDataWatcher().set(EntityZombieVillager.a, Boolean.valueOf(true));
|
|
|
|
|
- this.removeEffect(MobEffects.WEAKNESS);
|
|
|
|
|
- this.addEffect(new MobEffect(MobEffects.INCREASE_DAMAGE, i, Math.min(this.world.getDifficulty().a() - 1, 0)));
|
|
|
|
|
+ // CraftBukkit start
|
|
|
|
|
+ this.removeEffect(MobEffects.WEAKNESS, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.CONVERSION);
|
|
|
|
|
+ this.addEffect(new MobEffect(MobEffects.INCREASE_DAMAGE, i, Math.min(this.world.getDifficulty().a() - 1, 0)), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.CONVERSION);
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
this.world.broadcastEntityEffect(this, (byte) 16);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -123,7 +131,7 @@
|
2016-11-17 02:41:03 +01:00
|
|
|
entityvillager.setCustomNameVisible(this.getCustomNameVisible());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- this.world.addEntity(entityvillager);
|
|
|
|
|
+ this.world.addEntity(entityvillager, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CURED); // CraftBukkit - add SpawnReason
|
2018-07-15 02:00:00 +02:00
|
|
|
if (this.bD != null) {
|
|
|
|
|
EntityHuman entityhuman = this.world.b(this.bD);
|
2017-05-14 04:00:00 +02:00
|
|
|
|
2018-07-20 08:04:37 +02:00
|
|
|
@@ -132,7 +140,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
|
|
|
|
|
this.world.a((EntityHuman) null, 1027, new BlockPosition((int) this.locX, (int) this.locY, (int) this.locZ), 0);
|
|
|
|
|
}
|
|
|
|
|
|
