geforkt von Mirrors/Paper
126 Zeilen
6.2 KiB
Diff
126 Zeilen
6.2 KiB
Diff
--- a/net/minecraft/server/EntityZombie.java
|
|
+++ b/net/minecraft/server/EntityZombie.java
|
|
@@ -4,6 +4,13 @@
|
|
import java.util.List;
|
|
import java.util.UUID;
|
|
|
|
+//CraftBukkit start
|
|
+import org.bukkit.event.entity.CreatureSpawnEvent;
|
|
+import org.bukkit.event.entity.EntityCombustByEntityEvent;
|
|
+import org.bukkit.event.entity.EntityCombustEvent;
|
|
+import org.bukkit.event.entity.EntityTargetEvent;
|
|
+//CraftBukkit end
|
|
+
|
|
public class EntityZombie extends EntityMonster {
|
|
|
|
protected static final IAttribute a = (new AttributeRanged((IAttribute) null, "zombie.spawnReinforcements", 0.0D, 0.0D, 1.0D)).a("Spawn Reinforcements Chance");
|
|
@@ -18,6 +25,7 @@
|
|
private boolean bB = false;
|
|
private float bC = -1.0F;
|
|
private float bD;
|
|
+ private int lastTick = MinecraftServer.currentTick; // CraftBukkit - add field
|
|
|
|
public EntityZombie(World world) {
|
|
super(world);
|
|
@@ -152,7 +160,14 @@
|
|
}
|
|
|
|
if (flag) {
|
|
- this.setOnFire(8);
|
|
+ // CraftBukkit start
|
|
+ EntityCombustEvent event = new EntityCombustEvent(this.getBukkitEntity(), 8);
|
|
+ this.world.getServer().getPluginManager().callEvent(event);
|
|
+
|
|
+ if (!event.isCancelled()) {
|
|
+ this.setOnFire(event.getDuration());
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
}
|
|
}
|
|
@@ -182,8 +197,8 @@
|
|
if (this.world.getType(new BlockPosition(i1, j1 - 1, k1)).q() && this.world.getLightLevel(new BlockPosition(i1, j1, k1)) < 10) {
|
|
entityzombie.setPosition((double) i1, (double) j1, (double) k1);
|
|
if (!this.world.isPlayerNearby((double) i1, (double) j1, (double) k1, 7.0D) && this.world.a(entityzombie.getBoundingBox(), (Entity) entityzombie) && this.world.getCubes(entityzombie, entityzombie.getBoundingBox()).isEmpty() && !this.world.containsLiquid(entityzombie.getBoundingBox())) {
|
|
- this.world.addEntity(entityzombie);
|
|
- entityzombie.setGoalTarget(entityliving);
|
|
+ this.world.addEntity(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit
|
|
+ entityzombie.setGoalTarget(entityliving, EntityTargetEvent.TargetReason.REINFORCEMENT_TARGET, true);
|
|
entityzombie.prepare(this.world.D(new BlockPosition(entityzombie)), (GroupDataEntity) null);
|
|
this.getAttributeInstance(EntityZombie.a).b(new AttributeModifier("Zombie reinforcement caller charge", -0.05000000074505806D, 0));
|
|
entityzombie.getAttributeInstance(EntityZombie.a).b(new AttributeModifier("Zombie reinforcement callee charge", -0.05000000074505806D, 0));
|
|
@@ -202,6 +217,11 @@
|
|
public void m() {
|
|
if (!this.world.isClientSide && this.isConverting()) {
|
|
int i = this.getConversionTime();
|
|
+ // 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.bA -= i;
|
|
if (this.bA <= 0) {
|
|
@@ -219,7 +239,14 @@
|
|
int i = this.world.getDifficulty().a();
|
|
|
|
if (this.getItemInMainHand() == null && this.isBurning() && this.random.nextFloat() < (float) i * 0.3F) {
|
|
- entity.setOnFire(2 * i);
|
|
+ // CraftBukkit start
|
|
+ EntityCombustByEntityEvent event = new EntityCombustByEntityEvent(this.getBukkitEntity(), entity.getBukkitEntity(), 2 * i);
|
|
+ this.world.getServer().getPluginManager().callEvent(event);
|
|
+
|
|
+ if (!event.isCancelled()) {
|
|
+ entity.setOnFire(event.getDuration());
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
}
|
|
|
|
@@ -321,7 +348,7 @@
|
|
entityzombie.setCustomNameVisible(entityvillager.getCustomNameVisible());
|
|
}
|
|
|
|
- this.world.addEntity(entityzombie);
|
|
+ this.world.addEntity(entityzombie, CreatureSpawnEvent.SpawnReason.INFECTION); // CraftBukkit - add SpawnReason
|
|
this.world.a((EntityHuman) null, 1026, new BlockPosition((int) this.locX, (int) this.locY, (int) this.locZ), 0);
|
|
}
|
|
|
|
@@ -374,7 +401,7 @@
|
|
entitychicken1.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
|
|
entitychicken1.prepare(difficultydamagescaler, (GroupDataEntity) null);
|
|
entitychicken1.o(true);
|
|
- this.world.addEntity(entitychicken1);
|
|
+ this.world.addEntity(entitychicken1, CreatureSpawnEvent.SpawnReason.MOUNT); // CraftBukkit
|
|
this.startRiding(entitychicken1);
|
|
}
|
|
}
|
|
@@ -458,7 +485,7 @@
|
|
entityvillager.setCustomNameVisible(this.getCustomNameVisible());
|
|
}
|
|
|
|
- this.world.addEntity(entityvillager);
|
|
+ this.world.addEntity(entityvillager, CreatureSpawnEvent.SpawnReason.CURED); // CraftBukkit - add SpawnReason
|
|
entityvillager.addEffect(new MobEffect(MobEffects.CONFUSION, 200, 0));
|
|
this.world.a((EntityHuman) null, 1027, new BlockPosition((int) this.locX, (int) this.locY, (int) this.locZ), 0);
|
|
}
|
|
@@ -514,12 +541,16 @@
|
|
}
|
|
|
|
public void die(DamageSource damagesource) {
|
|
- super.die(damagesource);
|
|
+ // super.die(damagesource); // CraftBukkit
|
|
if (damagesource.getEntity() instanceof EntityCreeper && !(this instanceof EntityPigZombie) && ((EntityCreeper) damagesource.getEntity()).isPowered() && ((EntityCreeper) damagesource.getEntity()).canCauseHeadDrop()) {
|
|
((EntityCreeper) damagesource.getEntity()).setCausedHeadDrop();
|
|
- this.a(new ItemStack(Items.SKULL, 1, 2), 0.0F);
|
|
+ // CraftBukkit start
|
|
+ // this.a(new ItemStack(Items.SKULL, 1, 2), 0.0F);
|
|
+ headDrop = new ItemStack(Items.SKULL, 1, 2);
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
+ super.die(damagesource); // CraftBukkit - moved from above
|
|
}
|
|
|
|
static class SyntheticClass_1 { }
|