geforkt von Mirrors/Paper
121 Zeilen
6.5 KiB
Diff
121 Zeilen
6.5 KiB
Diff
--- a/net/minecraft/server/EntityZombie.java
|
|
+++ b/net/minecraft/server/EntityZombie.java
|
|
@@ -9,6 +9,15 @@
|
|
import java.util.function.Predicate;
|
|
import javax.annotation.Nullable;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory;
|
|
+import org.bukkit.entity.Zombie;
|
|
+import org.bukkit.event.entity.CreatureSpawnEvent;
|
|
+import org.bukkit.event.entity.EntityCombustByEntityEvent;
|
|
+import org.bukkit.event.entity.EntityTargetEvent;
|
|
+import org.bukkit.event.entity.EntityTransformEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public class EntityZombie extends EntityMonster {
|
|
|
|
private static final UUID b = UUID.fromString("B9766B59-9566-4402-BC1F-2EE2A276D836");
|
|
@@ -23,6 +32,7 @@
|
|
private boolean bs;
|
|
private int bt;
|
|
public int drownedConversionTime;
|
|
+ private int lastTick = MinecraftServer.currentTick; // CraftBukkit - add field
|
|
|
|
public EntityZombie(EntityTypes<? extends EntityZombie> entitytypes, World world) {
|
|
super(entitytypes, world);
|
|
@@ -139,7 +149,10 @@
|
|
public void tick() {
|
|
if (!this.world.isClientSide && this.isAlive() && !this.isNoAI()) {
|
|
if (this.isDrownConverting()) {
|
|
- --this.drownedConversionTime;
|
|
+ // CraftBukkit start - Use wall time instead of ticks for conversion
|
|
+ int elapsedTicks = MinecraftServer.currentTick - this.lastTick;
|
|
+ this.drownedConversionTime -= elapsedTicks;
|
|
+ // CraftBukkit end
|
|
if (this.drownedConversionTime < 0) {
|
|
this.eP();
|
|
}
|
|
@@ -156,6 +169,7 @@
|
|
}
|
|
|
|
super.tick();
|
|
+ this.lastTick = MinecraftServer.currentTick; // CraftBukkit
|
|
}
|
|
|
|
@Override
|
|
@@ -188,6 +202,7 @@
|
|
}
|
|
|
|
public void startDrownedConversion(int i) {
|
|
+ this.lastTick = MinecraftServer.currentTick; // CraftBukkit
|
|
this.drownedConversionTime = i;
|
|
this.getDataWatcher().set(EntityZombie.DROWN_CONVERTING, true);
|
|
}
|
|
@@ -201,12 +216,13 @@
|
|
}
|
|
|
|
protected void b(EntityTypes<? extends EntityZombie> entitytypes) {
|
|
- EntityZombie entityzombie = (EntityZombie) this.a(entitytypes, true);
|
|
+ EntityZombie entityzombie = (EntityZombie) this.a(entitytypes, true, EntityTransformEvent.TransformReason.DROWNED, CreatureSpawnEvent.SpawnReason.DROWNED);
|
|
|
|
if (entityzombie != null) {
|
|
entityzombie.y(entityzombie.world.getDamageScaler(entityzombie.getChunkCoordinates()).d());
|
|
entityzombie.u(entityzombie.eK() && this.eU());
|
|
}
|
|
+ else { ((Zombie) getBukkitEntity()).setConversionTime(-1); } // CraftBukkit - SPIGOT-5208: End conversion to stop event spam
|
|
|
|
}
|
|
|
|
@@ -245,9 +261,9 @@
|
|
if (SpawnerCreature.a(entitypositiontypes_surface, (IWorldReader) this.world, blockposition, entitytypes) && EntityPositionTypes.a(entitytypes, worldserver, EnumMobSpawn.REINFORCEMENT, blockposition, this.world.random)) {
|
|
entityzombie.setPosition((double) i1, (double) j1, (double) k1);
|
|
if (!this.world.isPlayerNearby((double) i1, (double) j1, (double) k1, 7.0D) && this.world.j((Entity) entityzombie) && this.world.getCubes(entityzombie) && !this.world.containsLiquid(entityzombie.getBoundingBox())) {
|
|
- entityzombie.setGoalTarget(entityliving);
|
|
+ entityzombie.setGoalTarget(entityliving, EntityTargetEvent.TargetReason.REINFORCEMENT_TARGET, true); // CraftBukkit
|
|
entityzombie.prepare(worldserver, this.world.getDamageScaler(entityzombie.getChunkCoordinates()), EnumMobSpawn.REINFORCEMENT, (GroupDataEntity) null, (NBTTagCompound) null);
|
|
- worldserver.addAllEntities(entityzombie);
|
|
+ worldserver.addAllEntities(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit
|
|
this.getAttributeInstance(GenericAttributes.SPAWN_REINFORCEMENTS).addModifier(new AttributeModifier("Zombie reinforcement caller charge", -0.05000000074505806D, AttributeModifier.Operation.ADDITION));
|
|
entityzombie.getAttributeInstance(GenericAttributes.SPAWN_REINFORCEMENTS).addModifier(new AttributeModifier("Zombie reinforcement callee charge", -0.05000000074505806D, AttributeModifier.Operation.ADDITION));
|
|
break;
|
|
@@ -268,7 +284,14 @@
|
|
float f = this.world.getDamageScaler(this.getChunkCoordinates()).b();
|
|
|
|
if (this.getItemInMainHand().isEmpty() && this.isBurning() && this.random.nextFloat() < f * 0.3F) {
|
|
- entity.setOnFire(2 * (int) f);
|
|
+ // CraftBukkit start
|
|
+ EntityCombustByEntityEvent event = new EntityCombustByEntityEvent(this.getBukkitEntity(), entity.getBukkitEntity(), 2 * (int) f); // PAIL: fixme
|
|
+ this.world.getServer().getPluginManager().callEvent(event);
|
|
+
|
|
+ if (!event.isCancelled()) {
|
|
+ entity.setOnFire(event.getDuration(), false);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
}
|
|
|
|
@@ -349,7 +372,12 @@
|
|
}
|
|
|
|
EntityVillager entityvillager = (EntityVillager) entityliving;
|
|
- EntityZombieVillager entityzombievillager = (EntityZombieVillager) entityvillager.a(EntityTypes.ZOMBIE_VILLAGER, false);
|
|
+ // CraftBukkit start
|
|
+ EntityZombieVillager entityzombievillager = (EntityZombieVillager) entityvillager.a(EntityTypes.ZOMBIE_VILLAGER, false, EntityTransformEvent.TransformReason.INFECTION, CreatureSpawnEvent.SpawnReason.INFECTION);
|
|
+ if (entityzombievillager == null) {
|
|
+ return;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
|
|
entityzombievillager.prepare(worldserver, worldserver.getDamageScaler(entityzombievillager.getChunkCoordinates()), EnumMobSpawn.CONVERSION, new EntityZombie.GroupDataZombie(false, true), (NBTTagCompound) null);
|
|
entityzombievillager.setVillagerData(entityvillager.getVillagerData());
|
|
@@ -406,7 +434,7 @@
|
|
entitychicken1.prepare(worldaccess, difficultydamagescaler, EnumMobSpawn.JOCKEY, (GroupDataEntity) null, (NBTTagCompound) null);
|
|
entitychicken1.setChickenJockey(true);
|
|
this.startRiding(entitychicken1);
|
|
- worldaccess.addEntity(entitychicken1);
|
|
+ worldaccess.addEntity(entitychicken1, CreatureSpawnEvent.SpawnReason.MOUNT); // CraftBukkit
|
|
}
|
|
}
|
|
}
|