--- a/net/minecraft/world/entity/EntityLiving.java +++ b/net/minecraft/world/entity/EntityLiving.java @@ -126,6 +126,32 @@ import net.minecraft.world.scores.ScoreboardTeam; import org.slf4j.Logger; +// CraftBukkit start +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Set; +import com.google.common.base.Function; +import net.minecraft.nbt.NBTTagFloat; +import net.minecraft.nbt.NBTTagInt; +import net.minecraft.world.entity.animal.EntityAnimal; +import org.bukkit.Location; +import org.bukkit.craftbukkit.attribute.CraftAttributeMap; +import org.bukkit.craftbukkit.event.CraftEventFactory; +import org.bukkit.craftbukkit.inventory.CraftItemStack; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; +import org.bukkit.event.entity.ArrowBodyCountChangeEvent; +import org.bukkit.event.entity.EntityDamageEvent; +import org.bukkit.event.entity.EntityDamageEvent.DamageModifier; +import org.bukkit.event.entity.EntityKnockbackEvent; +import org.bukkit.event.entity.EntityPotionEffectEvent; +import org.bukkit.event.entity.EntityRegainHealthEvent; +import org.bukkit.event.entity.EntityRemoveEvent; +import org.bukkit.event.entity.EntityResurrectEvent; +import org.bukkit.event.entity.EntityTeleportEvent; +import org.bukkit.event.player.PlayerItemConsumeEvent; +// CraftBukkit end + public abstract class EntityLiving extends Entity implements Attackable { private static final Logger LOGGER = LogUtils.getLogger(); @@ -237,6 +263,20 @@ protected BehaviorController brain; protected boolean skipDropExperience; protected float appliedScale; + // CraftBukkit start + public int expToDrop; + public boolean forceDrops; + public ArrayList drops = new ArrayList(); + public final org.bukkit.craftbukkit.attribute.CraftAttributeMap craftAttributes; + public boolean collides = true; + public Set collidableExemptions = new HashSet<>(); + public boolean bukkitPickUpLoot; + + @Override + public float getBukkitYaw() { + return getYHeadRot(); + } + // CraftBukkit end protected EntityLiving(EntityTypes entitytypes, World world) { super(entitytypes, world); @@ -251,7 +291,9 @@ this.lastClimbablePos = Optional.empty(); this.appliedScale = 1.0F; this.attributes = new AttributeMapBase(AttributeDefaults.getSupplier(entitytypes)); - this.setHealth(this.getMaxHealth()); + this.craftAttributes = new CraftAttributeMap(attributes); // CraftBukkit + // CraftBukkit - setHealth(getMaxHealth()) inlined and simplified to skip the instanceof check for EntityPlayer, as getBukkitEntity() is not initialized in constructor + this.entityData.set(EntityLiving.DATA_HEALTH_ID, (float) this.getAttribute(GenericAttributes.MAX_HEALTH).getValue()); this.blocksBuilding = true; this.rotA = (float) ((Math.random() + 1.0D) * 0.009999999776482582D); this.reapplyPosition(); @@ -329,7 +371,13 @@ double d8 = Math.min((double) (0.2F + f / 15.0F), 2.5D); int i = (int) (150.0D * d8); - ((WorldServer) this.level()).sendParticles(new ParticleParamBlock(Particles.BLOCK, iblockdata), d2, d3, d4, i, 0.0D, 0.0D, 0.0D, 0.15000000596046448D); + // CraftBukkit start - visiblity api + if (this instanceof EntityPlayer) { + ((WorldServer) this.level()).sendParticles((EntityPlayer) this, new ParticleParamBlock(Particles.BLOCK, iblockdata), d2, d3, d4, i, 0.0D, 0.0D, 0.0D, 0.15000000596046448D, false); + } else { + ((WorldServer) this.level()).sendParticles(new ParticleParamBlock(Particles.BLOCK, iblockdata), d2, d3, d4, i, 0.0D, 0.0D, 0.0D, 0.15000000596046448D); + } + // CraftBukkit end } } @@ -594,7 +642,7 @@ ++this.deathTime; if (this.deathTime >= 20 && !this.level().isClientSide() && !this.isRemoved()) { this.level().broadcastEntityEvent(this, (byte) 60); - this.remove(Entity.RemovalReason.KILLED); + this.remove(Entity.RemovalReason.KILLED, EntityRemoveEvent.Cause.DEATH); // CraftBukkit - add Bukkit remove cause } } @@ -693,13 +741,19 @@ } public void onEquipItem(EnumItemSlot enumitemslot, ItemStack itemstack, ItemStack itemstack1) { + // CraftBukkit start + onEquipItem(enumitemslot, itemstack, itemstack1, false); + } + + public void onEquipItem(EnumItemSlot enumitemslot, ItemStack itemstack, ItemStack itemstack1, boolean silent) { + // CraftBukkit end boolean flag = itemstack1.isEmpty() && itemstack.isEmpty(); if (!flag && !ItemStack.isSameItemSameComponents(itemstack, itemstack1) && !this.firstTick) { Equipable equipable = Equipable.get(itemstack1); if (!this.level().isClientSide() && !this.isSpectator()) { - if (!this.isSilent() && equipable != null && equipable.getEquipmentSlot() == enumitemslot) { + if (!this.isSilent() && equipable != null && equipable.getEquipmentSlot() == enumitemslot && !silent) { // CraftBukkit this.level().playSeededSound((EntityHuman) null, this.getX(), this.getY(), this.getZ(), equipable.getEquipSound(), this.getSoundSource(), 1.0F, 1.0F, this.random.nextLong()); } @@ -713,6 +767,13 @@ @Override public void remove(Entity.RemovalReason entity_removalreason) { + // CraftBukkit start - add Bukkit remove cause + this.remove(entity_removalreason, null); + } + + @Override + public void remove(Entity.RemovalReason entity_removalreason, EntityRemoveEvent.Cause cause) { + // CraftBukkit end if (entity_removalreason == Entity.RemovalReason.KILLED || entity_removalreason == Entity.RemovalReason.DISCARDED) { Iterator iterator = this.getActiveEffects().iterator(); @@ -723,7 +784,7 @@ } } - super.remove(entity_removalreason); + super.remove(entity_removalreason, cause); // CraftBukkit this.brain.clearMemories(); } @@ -783,6 +844,17 @@ } } + // CraftBukkit start + if (nbttagcompound.contains("Bukkit.MaxHealth")) { + NBTBase nbtbase = nbttagcompound.get("Bukkit.MaxHealth"); + if (nbtbase.getId() == 5) { + this.getAttribute(GenericAttributes.MAX_HEALTH).setBaseValue(((NBTTagFloat) nbtbase).getAsDouble()); + } else if (nbtbase.getId() == 3) { + this.getAttribute(GenericAttributes.MAX_HEALTH).setBaseValue(((NBTTagInt) nbtbase).getAsDouble()); + } + } + // CraftBukkit end + if (nbttagcompound.contains("Health", 99)) { this.setHealth(nbttagcompound.getFloat("Health")); } @@ -821,9 +893,32 @@ } + // CraftBukkit start + private boolean isTickingEffects = false; + private List effectsToProcess = Lists.newArrayList(); + + private static class ProcessableEffect { + + private Holder type; + private MobEffect effect; + private final EntityPotionEffectEvent.Cause cause; + + private ProcessableEffect(MobEffect effect, EntityPotionEffectEvent.Cause cause) { + this.effect = effect; + this.cause = cause; + } + + private ProcessableEffect(Holder type, EntityPotionEffectEvent.Cause cause) { + this.type = type; + this.cause = cause; + } + } + // CraftBukkit end + protected void tickEffects() { Iterator> iterator = this.activeEffects.keySet().iterator(); + isTickingEffects = true; // CraftBukkit try { while (iterator.hasNext()) { Holder holder = (Holder) iterator.next(); @@ -833,6 +928,12 @@ this.onEffectUpdated(mobeffect, true, (Entity) null); })) { if (!this.level().isClientSide) { + // CraftBukkit start + EntityPotionEffectEvent event = CraftEventFactory.callEntityPotionEffectChangeEvent(this, mobeffect, null, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.EXPIRATION); + if (event.isCancelled()) { + continue; + } + // CraftBukkit end iterator.remove(); this.onEffectRemoved(mobeffect); } @@ -843,6 +944,17 @@ } catch (ConcurrentModificationException concurrentmodificationexception) { ; } + // CraftBukkit start + isTickingEffects = false; + for (ProcessableEffect e : effectsToProcess) { + if (e.effect != null) { + addEffect(e.effect, e.cause); + } else { + removeEffect(e.type, e.cause); + } + } + effectsToProcess.clear(); + // CraftBukkit end if (this.effectsDirty) { if (!this.level().isClientSide) { @@ -958,7 +1070,13 @@ this.entityData.set(EntityLiving.DATA_EFFECT_PARTICLES, List.of()); } + // CraftBukkit start public boolean removeAllEffects() { + return removeAllEffects(org.bukkit.event.entity.EntityPotionEffectEvent.Cause.UNKNOWN); + } + + public boolean removeAllEffects(EntityPotionEffectEvent.Cause cause) { + // CraftBukkit end if (this.level().isClientSide) { return false; } else { @@ -967,7 +1085,14 @@ boolean flag; for (flag = false; iterator.hasNext(); flag = true) { - this.onEffectRemoved((MobEffect) iterator.next()); + // CraftBukkit start + MobEffect effect = (MobEffect) iterator.next(); + EntityPotionEffectEvent event = CraftEventFactory.callEntityPotionEffectChangeEvent(this, effect, null, cause, EntityPotionEffectEvent.Action.CLEARED); + if (event.isCancelled()) { + continue; + } + this.onEffectRemoved(effect); + // CraftBukkit end iterator.remove(); } @@ -996,20 +1121,50 @@ return this.addEffect(mobeffect, (Entity) null); } + // CraftBukkit start + public boolean addEffect(MobEffect mobeffect, EntityPotionEffectEvent.Cause cause) { + return this.addEffect(mobeffect, (Entity) null, cause); + } + public boolean addEffect(MobEffect mobeffect, @Nullable Entity entity) { + return this.addEffect(mobeffect, entity, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.UNKNOWN); + } + + public boolean addEffect(MobEffect mobeffect, @Nullable Entity entity, EntityPotionEffectEvent.Cause cause) { + if (isTickingEffects) { + effectsToProcess.add(new ProcessableEffect(mobeffect, cause)); + return true; + } + // CraftBukkit end + if (!this.canBeAffected(mobeffect)) { return false; } else { MobEffect mobeffect1 = (MobEffect) this.activeEffects.get(mobeffect.getEffect()); boolean flag = false; + // CraftBukkit start + boolean override = false; + if (mobeffect1 != null) { + override = new MobEffect(mobeffect1).update(mobeffect); + } + + EntityPotionEffectEvent event = CraftEventFactory.callEntityPotionEffectChangeEvent(this, mobeffect1, mobeffect, cause, override); + if (event.isCancelled()) { + return false; + } + // CraftBukkit end + if (mobeffect1 == null) { this.activeEffects.put(mobeffect.getEffect(), mobeffect); this.onEffectAdded(mobeffect, entity); flag = true; mobeffect.onEffectAdded(this); - } else if (mobeffect1.update(mobeffect)) { + // CraftBukkit start + } else if (event.isOverride()) { + mobeffect1.update(mobeffect); this.onEffectUpdated(mobeffect1, true, entity); + // CraftBukkit end flag = true; } @@ -1040,13 +1195,39 @@ return this.getType().is(TagsEntity.INVERTED_HEALING_AND_HARM); } + // CraftBukkit start @Nullable public MobEffect removeEffectNoUpdate(Holder holder) { + return removeEffectNoUpdate(holder, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.UNKNOWN); + } + + @Nullable + public MobEffect removeEffectNoUpdate(Holder holder, EntityPotionEffectEvent.Cause cause) { + if (isTickingEffects) { + effectsToProcess.add(new ProcessableEffect(holder, cause)); + return null; + } + + MobEffect effect = this.activeEffects.get(holder); + if (effect == null) { + return null; + } + + EntityPotionEffectEvent event = CraftEventFactory.callEntityPotionEffectChangeEvent(this, effect, null, cause); + if (event.isCancelled()) { + return null; + } + return (MobEffect) this.activeEffects.remove(holder); } public boolean removeEffect(Holder holder) { - MobEffect mobeffect = this.removeEffectNoUpdate(holder); + return removeEffect(holder, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.UNKNOWN); + } + + public boolean removeEffect(Holder holder, EntityPotionEffectEvent.Cause cause) { + MobEffect mobeffect = this.removeEffectNoUpdate(holder, cause); + // CraftBukkit end if (mobeffect != null) { this.onEffectRemoved(mobeffect); @@ -1142,20 +1323,55 @@ } + // CraftBukkit start - Delegate so we can handle providing a reason for health being regained public void heal(float f) { + heal(f, EntityRegainHealthEvent.RegainReason.CUSTOM); + } + + public void heal(float f, EntityRegainHealthEvent.RegainReason regainReason) { float f1 = this.getHealth(); if (f1 > 0.0F) { - this.setHealth(f1 + f); + EntityRegainHealthEvent event = new EntityRegainHealthEvent(this.getBukkitEntity(), f, regainReason); + // Suppress during worldgen + if (this.valid) { + this.level().getCraftServer().getPluginManager().callEvent(event); + } + + if (!event.isCancelled()) { + this.setHealth((float) (this.getHealth() + event.getAmount())); + } + // CraftBukkit end } } public float getHealth() { + // CraftBukkit start - Use unscaled health + if (this instanceof EntityPlayer) { + return (float) ((EntityPlayer) this).getBukkitEntity().getHealth(); + } + // CraftBukkit end return (Float) this.entityData.get(EntityLiving.DATA_HEALTH_ID); } public void setHealth(float f) { + // CraftBukkit start - Handle scaled health + if (this instanceof EntityPlayer) { + org.bukkit.craftbukkit.entity.CraftPlayer player = ((EntityPlayer) this).getBukkitEntity(); + // Squeeze + if (f < 0.0F) { + player.setRealHealth(0.0D); + } else if (f > player.getMaxHealth()) { + player.setRealHealth(player.getMaxHealth()); + } else { + player.setRealHealth(f); + } + + player.updateScaledHealth(false); + return; + } + // CraftBukkit end this.entityData.set(EntityLiving.DATA_HEALTH_ID, MathHelper.clamp(f, 0.0F, this.getMaxHealth())); } @@ -1169,7 +1385,7 @@ return false; } else if (this.level().isClientSide) { return false; - } else if (this.isDeadOrDying()) { + } else if (this.isRemoved() || this.dead || this.getHealth() <= 0.0F) { // CraftBukkit - Don't allow entities that got set to dead/killed elsewhere to get damaged and die return false; } else if (damagesource.is(DamageTypeTags.IS_FIRE) && this.hasEffect(MobEffects.FIRE_RESISTANCE)) { return false; @@ -1180,10 +1396,11 @@ this.noActionTime = 0; float f1 = f; - boolean flag = false; + boolean flag = f > 0.0F && this.isDamageSourceBlocked(damagesource); // Copied from below float f2 = 0.0F; - if (f > 0.0F && this.isDamageSourceBlocked(damagesource)) { + // CraftBukkit - Moved into actuallyHurt(DamageSource, float) + if (false && f > 0.0F && this.isDamageSourceBlocked(damagesource)) { this.hurtCurrentlyUsedShield(f); f2 = f; f = 0.0F; @@ -1204,7 +1421,8 @@ f *= 5.0F; } - if (damagesource.is(DamageTypeTags.DAMAGES_HELMET) && !this.getItemBySlot(EnumItemSlot.HEAD).isEmpty()) { + // CraftBukkit - Moved into actuallyHurt(DamageSource, float) + if (false && damagesource.is(DamageTypeTags.DAMAGES_HELMET) && !this.getItemBySlot(EnumItemSlot.HEAD).isEmpty()) { this.hurtHelmet(damagesource, f); f *= 0.75F; } @@ -1212,18 +1430,27 @@ this.walkAnimation.setSpeed(1.5F); boolean flag1 = true; - if ((float) this.invulnerableTime > 10.0F && !damagesource.is(DamageTypeTags.BYPASSES_COOLDOWN)) { + if ((float) this.invulnerableTime > (float) this.invulnerableDuration / 2.0F && !damagesource.is(DamageTypeTags.BYPASSES_COOLDOWN)) { // CraftBukkit - restore use of maxNoDamageTicks if (f <= this.lastHurt) { return false; } - this.actuallyHurt(damagesource, f - this.lastHurt); + // CraftBukkit start + if (!this.actuallyHurt(damagesource, f - this.lastHurt)) { + return false; + } + // CraftBukkit end this.lastHurt = f; flag1 = false; } else { + // CraftBukkit start + if (!this.actuallyHurt(damagesource, f)) { + return false; + } this.lastHurt = f; - this.invulnerableTime = 20; - this.actuallyHurt(damagesource, f); + this.invulnerableTime = this.invulnerableDuration; // CraftBukkit - restore use of maxNoDamageTicks + // this.actuallyHurt(damagesource, f); + // CraftBukkit end this.hurtDuration = 10; this.hurtTime = this.hurtDuration; } @@ -1269,7 +1496,7 @@ this.level().broadcastDamageEvent(this, damagesource); } - if (!damagesource.is(DamageTypeTags.NO_IMPACT) && (!flag || f > 0.0F)) { + if (!damagesource.is(DamageTypeTags.NO_IMPACT) && !flag) { // CraftBukkit - Prevent marking hurt if the damage is blocked this.markHurt(); } @@ -1282,7 +1509,7 @@ d0 = (Math.random() - Math.random()) * 0.01D; } - this.knockback(0.4000000059604645D, d0, d1); + this.knockback(0.4000000059604645D, d0, d1, entity1, entity1 == null ? EntityKnockbackEvent.KnockbackCause.DAMAGE : EntityKnockbackEvent.KnockbackCause.ENTITY_ATTACK); // CraftBukkit if (!flag) { this.indicateDamage(d0, d1); } @@ -1301,7 +1528,7 @@ this.playHurtSound(damagesource); } - boolean flag2 = !flag || f > 0.0F; + boolean flag2 = !flag; // CraftBukkit - Ensure to return false if damage is blocked if (flag2) { this.lastDamageSource = damagesource; @@ -1335,7 +1562,7 @@ } protected void blockedByShield(EntityLiving entityliving) { - entityliving.knockback(0.5D, entityliving.getX() - this.getX(), entityliving.getZ() - this.getZ()); + entityliving.knockback(0.5D, entityliving.getX() - this.getX(), entityliving.getZ() - this.getZ(), null, EntityKnockbackEvent.KnockbackCause.SHIELD_BLOCK); // CraftBukkit } private boolean checkTotemDeathProtection(DamageSource damagesource) { @@ -1346,19 +1573,32 @@ EnumHand[] aenumhand = EnumHand.values(); int i = aenumhand.length; + // CraftBukkit start + EnumHand hand = null; + ItemStack itemstack1 = ItemStack.EMPTY; for (int j = 0; j < i; ++j) { EnumHand enumhand = aenumhand[j]; - ItemStack itemstack1 = this.getItemInHand(enumhand); + itemstack1 = this.getItemInHand(enumhand); if (itemstack1.is(Items.TOTEM_OF_UNDYING)) { + hand = enumhand; // CraftBukkit itemstack = itemstack1.copy(); - itemstack1.shrink(1); + // itemstack1.subtract(1); // CraftBukkit break; } } - if (itemstack != null) { - if (this instanceof EntityPlayer) { + org.bukkit.inventory.EquipmentSlot handSlot = (hand != null) ? org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand) : null; + EntityResurrectEvent event = new EntityResurrectEvent((LivingEntity) this.getBukkitEntity(), handSlot); + event.setCancelled(itemstack == null); + this.level().getCraftServer().getPluginManager().callEvent(event); + + if (!event.isCancelled()) { + if (!itemstack1.isEmpty()) { + itemstack1.shrink(1); + } + if (itemstack != null && this instanceof EntityPlayer) { + // CraftBukkit end EntityPlayer entityplayer = (EntityPlayer) this; entityplayer.awardStat(StatisticList.ITEM_USED.get(Items.TOTEM_OF_UNDYING)); @@ -1367,14 +1607,16 @@ } this.setHealth(1.0F); - this.removeAllEffects(); - this.addEffect(new MobEffect(MobEffects.REGENERATION, 900, 1)); - this.addEffect(new MobEffect(MobEffects.ABSORPTION, 100, 1)); - this.addEffect(new MobEffect(MobEffects.FIRE_RESISTANCE, 800, 0)); + // CraftBukkit start + this.removeAllEffects(org.bukkit.event.entity.EntityPotionEffectEvent.Cause.TOTEM); + this.addEffect(new MobEffect(MobEffects.REGENERATION, 900, 1), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.TOTEM); + this.addEffect(new MobEffect(MobEffects.ABSORPTION, 100, 1), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.TOTEM); + this.addEffect(new MobEffect(MobEffects.FIRE_RESISTANCE, 800, 0), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.TOTEM); + // CraftBukkit end this.level().broadcastEntityEvent(this, (byte) 35); } - return itemstack != null; + return !event.isCancelled(); } } @@ -1481,14 +1723,22 @@ IBlockData iblockdata = Blocks.WITHER_ROSE.defaultBlockState(); if (this.level().getBlockState(blockposition).isAir() && iblockdata.canSurvive(this.level(), blockposition)) { - this.level().setBlock(blockposition, iblockdata, 3); - flag = true; + // CraftBukkit start - call EntityBlockFormEvent for Wither Rose + flag = org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this.level(), blockposition, iblockdata, 3, this); + // CraftBukkit end } } if (!flag) { EntityItem entityitem = new EntityItem(this.level(), this.getX(), this.getY(), this.getZ(), new ItemStack(Items.WITHER_ROSE)); + // CraftBukkit start + org.bukkit.event.entity.EntityDropItemEvent event = new org.bukkit.event.entity.EntityDropItemEvent(this.getBukkitEntity(), (org.bukkit.entity.Item) entityitem.getBukkitEntity()); + CraftEventFactory.callEvent(event); + if (event.isCancelled()) { + return; + } + // CraftBukkit end this.level().addFreshEntity(entityitem); } } @@ -1508,21 +1758,40 @@ boolean flag = this.lastHurtByPlayerTime > 0; + this.dropEquipment(); // CraftBukkit - from below if (this.shouldDropLoot() && this.level().getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) { this.dropFromLootTable(damagesource, flag); this.dropCustomDeathLoot(damagesource, i, flag); } + // CraftBukkit start - Call death event + CraftEventFactory.callEntityDeathEvent(this, damagesource, this.drops); + this.drops = new ArrayList<>(); + // CraftBukkit end - this.dropEquipment(); + // this.dropInventory();// CraftBukkit - moved up this.dropExperience(); } protected void dropEquipment() {} - protected void dropExperience() { + // CraftBukkit start + public int getExpReward() { if (this.level() instanceof WorldServer && !this.wasExperienceConsumed() && (this.isAlwaysExperienceDropper() || this.lastHurtByPlayerTime > 0 && this.shouldDropExperience() && this.level().getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT))) { - EntityExperienceOrb.award((WorldServer) this.level(), this.position(), this.getExperienceReward()); + int i = this.getExperienceReward(); + return i; + } else { + return 0; } + } + // CraftBukkit end + + protected void dropExperience() { + // CraftBukkit start - Update getExpReward() above if the removed if() changes! + if (true && !(this instanceof net.minecraft.world.entity.boss.enderdragon.EntityEnderDragon)) { // CraftBukkit - SPIGOT-2420: Special case ender dragon will drop the xp over time + EntityExperienceOrb.award((WorldServer) this.level(), this.position(), this.expToDrop); + this.expToDrop = 0; + } + // CraftBukkit end } @@ -1551,13 +1820,25 @@ } public void knockback(double d0, double d1, double d2) { + // CraftBukkit start - EntityKnockbackEvent + knockback(d0, d1, d2, null, EntityKnockbackEvent.KnockbackCause.UNKNOWN); + } + + public void knockback(double d0, double d1, double d2, Entity attacker, EntityKnockbackEvent.KnockbackCause cause) { d0 *= 1.0D - this.getAttributeValue(GenericAttributes.KNOCKBACK_RESISTANCE); - if (d0 > 0.0D) { - this.hasImpulse = true; + if (true || d0 > 0.0D) { // CraftBukkit - Call event even when force is 0 + //this.hasImpulse = true; // CraftBukkit - Move down Vec3D vec3d = this.getDeltaMovement(); Vec3D vec3d1 = (new Vec3D(d1, 0.0D, d2)).normalize().scale(d0); - this.setDeltaMovement(vec3d.x / 2.0D - vec3d1.x, this.onGround() ? Math.min(0.4D, vec3d.y / 2.0D + d0) : vec3d.y, vec3d.z / 2.0D - vec3d1.z); + EntityKnockbackEvent event = CraftEventFactory.callEntityKnockbackEvent((org.bukkit.craftbukkit.entity.CraftLivingEntity) this.getBukkitEntity(), attacker, cause, d0, vec3d1, vec3d.x / 2.0D - vec3d1.x, this.onGround() ? Math.min(0.4D, vec3d.y / 2.0D + d0) : vec3d.y, vec3d.z / 2.0D - vec3d1.z); + if (event.isCancelled()) { + return; + } + + this.hasImpulse = true; + this.setDeltaMovement(event.getFinalKnockback().getX(), event.getFinalKnockback().getY(), event.getFinalKnockback().getZ()); + // CraftBukkit end } } @@ -1614,6 +1895,28 @@ return itemstack.getEatingSound(); } + // CraftBukkit start - Add delegate methods + public SoundEffect getHurtSound0(DamageSource damagesource) { + return getHurtSound(damagesource); + } + + public SoundEffect getDeathSound0() { + return getDeathSound(); + } + + public SoundEffect getFallDamageSound0(int fallHeight) { + return getFallDamageSound(fallHeight); + } + + public SoundEffect getDrinkingSound0(ItemStack itemstack) { + return getDrinkingSound(itemstack); + } + + public SoundEffect getEatingSound0(ItemStack itemstack) { + return getEatingSound(itemstack); + } + // CraftBukkit end + public Optional getLastClimbablePos() { return this.lastClimbablePos; } @@ -1669,9 +1972,14 @@ int i = this.calculateFallDamage(f, f1); if (i > 0) { + // CraftBukkit start + if (!this.hurt(damagesource, (float) i)) { + return true; + } + // CraftBukkit end this.playSound(this.getFallDamageSound(i), 1.0F, 1.0F); this.playBlockFallSound(); - this.hurt(damagesource, (float) i); + // this.damageEntity(damagesource, (float) i); // CraftBukkit - moved up return true; } else { return flag; @@ -1741,7 +2049,7 @@ protected float getDamageAfterArmorAbsorb(DamageSource damagesource, float f) { if (!damagesource.is(DamageTypeTags.BYPASSES_ARMOR)) { - this.hurtArmor(damagesource, f); + // this.hurtArmor(damagesource, f); // CraftBukkit - Moved into actuallyHurt(DamageSource, float) f = CombatMath.getDamageAfterAbsorb(f, damagesource, (float) this.getArmorValue(), (float) this.getAttributeValue(GenericAttributes.ARMOR_TOUGHNESS)); } @@ -1754,7 +2062,8 @@ } else { int i; - if (this.hasEffect(MobEffects.DAMAGE_RESISTANCE) && !damagesource.is(DamageTypeTags.BYPASSES_RESISTANCE)) { + // CraftBukkit - Moved to actuallyHurt(DamageSource, float) + if (false && this.hasEffect(MobEffects.DAMAGE_RESISTANCE) && !damagesource.is(DamageTypeTags.BYPASSES_RESISTANCE)) { i = (this.getEffect(MobEffects.DAMAGE_RESISTANCE).getAmplifier() + 1) * 5; int j = 25 - i; float f1 = f * (float) j; @@ -1787,16 +2096,125 @@ } } - protected void actuallyHurt(DamageSource damagesource, float f) { - if (!this.isInvulnerableTo(damagesource)) { - f = this.getDamageAfterArmorAbsorb(damagesource, f); - f = this.getDamageAfterMagicAbsorb(damagesource, f); - float f1 = f; + // CraftBukkit start + protected boolean actuallyHurt(final DamageSource damagesource, float f) { // void -> boolean, add final + if (!this.isInvulnerableTo(damagesource)) { + final boolean human = this instanceof EntityHuman; + float originalDamage = f; + Function hardHat = new Function() { + @Override + public Double apply(Double f) { + if (damagesource.is(DamageTypeTags.DAMAGES_HELMET) && !EntityLiving.this.getItemBySlot(EnumItemSlot.HEAD).isEmpty()) { + return -(f - (f * 0.75F)); - f = Math.max(f - this.getAbsorptionAmount(), 0.0F); - this.setAbsorptionAmount(this.getAbsorptionAmount() - (f1 - f)); - float f2 = f1 - f; + } + return -0.0; + } + }; + float hardHatModifier = hardHat.apply((double) f).floatValue(); + f += hardHatModifier; + + Function blocking = new Function() { + @Override + public Double apply(Double f) { + return -((EntityLiving.this.isDamageSourceBlocked(damagesource)) ? f : 0.0); + } + }; + float blockingModifier = blocking.apply((double) f).floatValue(); + f += blockingModifier; + + Function armor = new Function() { + @Override + public Double apply(Double f) { + return -(f - EntityLiving.this.getDamageAfterArmorAbsorb(damagesource, f.floatValue())); + } + }; + float armorModifier = armor.apply((double) f).floatValue(); + f += armorModifier; + + Function resistance = new Function() { + @Override + public Double apply(Double f) { + if (!damagesource.is(DamageTypeTags.BYPASSES_EFFECTS) && EntityLiving.this.hasEffect(MobEffects.DAMAGE_RESISTANCE) && !damagesource.is(DamageTypeTags.BYPASSES_RESISTANCE)) { + int i = (EntityLiving.this.getEffect(MobEffects.DAMAGE_RESISTANCE).getAmplifier() + 1) * 5; + int j = 25 - i; + float f1 = f.floatValue() * (float) j; + return -(f - (f1 / 25.0F)); + } + return -0.0; + } + }; + float resistanceModifier = resistance.apply((double) f).floatValue(); + f += resistanceModifier; + + Function magic = new Function() { + @Override + public Double apply(Double f) { + return -(f - EntityLiving.this.getDamageAfterMagicAbsorb(damagesource, f.floatValue())); + } + }; + float magicModifier = magic.apply((double) f).floatValue(); + f += magicModifier; + + Function absorption = new Function() { + @Override + public Double apply(Double f) { + return -(Math.max(f - Math.max(f - EntityLiving.this.getAbsorptionAmount(), 0.0F), 0.0F)); + } + }; + float absorptionModifier = absorption.apply((double) f).floatValue(); + + EntityDamageEvent event = CraftEventFactory.handleLivingEntityDamageEvent(this, damagesource, originalDamage, hardHatModifier, blockingModifier, armorModifier, resistanceModifier, magicModifier, absorptionModifier, hardHat, blocking, armor, resistance, magic, absorption); + if (damagesource.getEntity() instanceof EntityHuman) { + ((EntityHuman) damagesource.getEntity()).resetAttackStrengthTicker(); // Moved from EntityHuman in order to make the cooldown reset get called after the damage event is fired + } + if (event.isCancelled()) { + return false; + } + + f = (float) event.getFinalDamage(); + + // Resistance + if (event.getDamage(DamageModifier.RESISTANCE) < 0) { + float f3 = (float) -event.getDamage(DamageModifier.RESISTANCE); + if (f3 > 0.0F && f3 < 3.4028235E37F) { + if (this instanceof EntityPlayer) { + ((EntityPlayer) this).awardStat(StatisticList.DAMAGE_RESISTED, Math.round(f3 * 10.0F)); + } else if (damagesource.getEntity() instanceof EntityPlayer) { + ((EntityPlayer) damagesource.getEntity()).awardStat(StatisticList.DAMAGE_DEALT_RESISTED, Math.round(f3 * 10.0F)); + } + } + } + + // Apply damage to helmet + if (damagesource.is(DamageTypeTags.DAMAGES_HELMET) && !this.getItemBySlot(EnumItemSlot.HEAD).isEmpty()) { + this.hurtHelmet(damagesource, f); + } + // Apply damage to armor + if (!damagesource.is(DamageTypeTags.BYPASSES_ARMOR)) { + float armorDamage = (float) (event.getDamage() + event.getDamage(DamageModifier.BLOCKING) + event.getDamage(DamageModifier.HARD_HAT)); + this.hurtArmor(damagesource, armorDamage); + } + + // Apply blocking code // PAIL: steal from above + if (event.getDamage(DamageModifier.BLOCKING) < 0) { + this.level().broadcastEntityEvent(this, (byte) 29); // SPIGOT-4635 - shield damage sound + this.hurtCurrentlyUsedShield((float) -event.getDamage(DamageModifier.BLOCKING)); + Entity entity = damagesource.getDirectEntity(); + + if (entity instanceof EntityLiving) { + this.blockUsingShield((EntityLiving) entity); + } + } + + absorptionModifier = (float) -event.getDamage(DamageModifier.ABSORPTION); + this.setAbsorptionAmount(Math.max(this.getAbsorptionAmount() - absorptionModifier, 0.0F)); + float f2 = absorptionModifier; + + if (f2 > 0.0F && f2 < 3.4028235E37F && this instanceof EntityHuman) { + ((EntityHuman) this).awardStat(StatisticList.DAMAGE_ABSORBED, Math.round(f2 * 10.0F)); + } if (f2 > 0.0F && f2 < 3.4028235E37F) { Entity entity = damagesource.getEntity(); @@ -1807,13 +2225,47 @@ } } - if (f != 0.0F) { + if (f > 0 || !human) { + if (human) { + // PAIL: Be sure to drag all this code from the EntityHuman subclass each update. + ((EntityHuman) this).causeFoodExhaustion(damagesource.getFoodExhaustion(), org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason.DAMAGED); // CraftBukkit - EntityExhaustionEvent + if (f < 3.4028235E37F) { + ((EntityHuman) this).awardStat(StatisticList.DAMAGE_TAKEN, Math.round(f * 10.0F)); + } + } + // CraftBukkit end this.getCombatTracker().recordDamage(damagesource, f); this.setHealth(this.getHealth() - f); - this.setAbsorptionAmount(this.getAbsorptionAmount() - f); + // CraftBukkit start + if (!human) { + this.setAbsorptionAmount(this.getAbsorptionAmount() - f); + } this.gameEvent(GameEvent.ENTITY_DAMAGE); + + return true; + } else { + // Duplicate triggers if blocking + if (event.getDamage(DamageModifier.BLOCKING) < 0) { + if (this instanceof EntityPlayer) { + CriterionTriggers.ENTITY_HURT_PLAYER.trigger((EntityPlayer) this, damagesource, f, originalDamage, true); + f2 = (float) -event.getDamage(DamageModifier.BLOCKING); + if (f2 > 0.0F && f2 < 3.4028235E37F) { + ((EntityPlayer) this).awardStat(StatisticList.DAMAGE_BLOCKED_BY_SHIELD, Math.round(originalDamage * 10.0F)); + } + } + + if (damagesource.getEntity() instanceof EntityPlayer) { + CriterionTriggers.PLAYER_HURT_ENTITY.trigger((EntityPlayer) damagesource.getEntity(), this, damagesource, f, originalDamage, true); + } + + return true; + } else { + return originalDamage > 0; + } + // CraftBukkit end } } + return false; // CraftBukkit } public CombatTracker getCombatTracker() { @@ -1838,8 +2290,18 @@ } public final void setArrowCount(int i) { - this.entityData.set(EntityLiving.DATA_ARROW_COUNT_ID, i); + // CraftBukkit start + setArrowCount(i, false); + } + + public final void setArrowCount(int i, boolean flag) { + ArrowBodyCountChangeEvent event = CraftEventFactory.callArrowBodyCountChangeEvent(this, getArrowCount(), i, flag); + if (event.isCancelled()) { + return; + } + this.entityData.set(EntityLiving.DATA_ARROW_COUNT_ID, event.getNewAmount()); } + // CraftBukkit end public final int getStingerCount() { return (Integer) this.entityData.get(EntityLiving.DATA_STINGER_COUNT_ID); @@ -2075,6 +2537,12 @@ public abstract ItemStack getItemBySlot(EnumItemSlot enumitemslot); + // CraftBukkit start + public void setItemSlot(EnumItemSlot enumitemslot, ItemStack itemstack, boolean silent) { + this.setItemSlot(enumitemslot, itemstack); + } + // CraftBukkit end + public abstract void setItemSlot(EnumItemSlot enumitemslot, ItemStack itemstack); public Iterable getHandSlots() { @@ -2328,6 +2796,7 @@ } if (this.onGround() && !this.level().isClientSide) { + if (getSharedFlag(7) && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit this.setSharedFlag(7, false); } } else { @@ -2498,7 +2967,7 @@ } } - this.detectEquipmentUpdates(); + this.detectEquipmentUpdatesPublic(); // CraftBukkit if (this.tickCount % 20 == 0) { this.getCombatTracker().recheckStatus(); } @@ -2602,7 +3071,7 @@ } - public void detectEquipmentUpdates() { + public void detectEquipmentUpdatesPublic() { // CraftBukkit Map map = this.collectEquipmentChanges(); if (map != null) { @@ -2924,6 +3393,7 @@ } if (!this.level().isClientSide) { + if (flag != this.getSharedFlag(7) && !CraftEventFactory.callToggleGlideEvent(this, flag).isCancelled()) // CraftBukkit this.setSharedFlag(7, flag); } @@ -3114,14 +3584,21 @@ @Override public boolean isPickable() { - return !this.isRemoved(); + return !this.isRemoved() && this.collides; // CraftBukkit } @Override public boolean isPushable() { - return this.isAlive() && !this.isSpectator() && !this.onClimbable(); + return this.isAlive() && !this.isSpectator() && !this.onClimbable() && this.collides; // CraftBukkit } + // CraftBukkit start - collidable API + @Override + public boolean canCollideWithBukkit(Entity entity) { + return isPushable() && this.collides != this.collidableExemptions.contains(entity.getUUID()); + } + // CraftBukkit end + @Override public float getYHeadRot() { return this.yHeadRot; @@ -3314,7 +3791,26 @@ } else { if (!this.useItem.isEmpty() && this.isUsingItem()) { this.triggerItemUseEffects(this.useItem, 16); - ItemStack itemstack = this.useItem.finishUsingItem(this.level(), this); + // CraftBukkit start - fire PlayerItemConsumeEvent + ItemStack itemstack; + if (this instanceof EntityPlayer) { + org.bukkit.inventory.ItemStack craftItem = CraftItemStack.asBukkitCopy(this.useItem); + org.bukkit.inventory.EquipmentSlot hand = org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(enumhand); + PlayerItemConsumeEvent event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem, hand); + this.level().getCraftServer().getPluginManager().callEvent(event); + + if (event.isCancelled()) { + // Update client + ((EntityPlayer) this).getBukkitEntity().updateInventory(); + ((EntityPlayer) this).getBukkitEntity().updateScaledHealth(); + return; + } + + itemstack = (craftItem.equals(event.getItem())) ? this.useItem.finishUsingItem(this.level(), this) : CraftItemStack.asNMSCopy(event.getItem()).finishUsingItem(this.level(), this); + } else { + itemstack = this.useItem.finishUsingItem(this.level(), this); + } + // CraftBukkit end if (itemstack != this.useItem) { this.setItemInHand(enumhand, itemstack); @@ -3392,6 +3888,12 @@ } public boolean randomTeleport(double d0, double d1, double d2, boolean flag) { + // CraftBukkit start + return randomTeleport(d0, d1, d2, flag, org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.UNKNOWN).orElse(false); + } + + public Optional randomTeleport(double d0, double d1, double d2, boolean flag, org.bukkit.event.player.PlayerTeleportEvent.TeleportCause cause) { + // CraftBukkit end double d3 = this.getX(); double d4 = this.getY(); double d5 = this.getZ(); @@ -3416,16 +3918,41 @@ } if (flag2) { - this.teleportTo(d0, d6, d2); + // CraftBukkit start - Teleport event + // this.teleportTo(d0, d6, d2); + + // first set position, to check if the place to teleport is valid + this.setPos(d0, d6, d2); if (world.noCollision((Entity) this) && !world.containsAnyLiquid(this.getBoundingBox())) { flag1 = true; } + // now revert and call event if the teleport place is valid + this.setPos(d3, d4, d5); + + if (flag1) { + if (!(this instanceof EntityPlayer)) { + EntityTeleportEvent teleport = new EntityTeleportEvent(this.getBukkitEntity(), new Location(this.level().getWorld(), d3, d4, d5), new Location(this.level().getWorld(), d0, d6, d2)); + this.level().getCraftServer().getPluginManager().callEvent(teleport); + if (!teleport.isCancelled()) { + Location to = teleport.getTo(); + this.teleportTo(to.getX(), to.getY(), to.getZ()); + } else { + return Optional.empty(); + } + } else { + // player teleport event is called in the underlining code + if (((EntityPlayer) this).connection.teleport(d0, d6, d2, this.getYRot(), this.getXRot(), java.util.Collections.emptySet(), cause)) { + return Optional.empty(); + } + } + } + // CraftBukkit end } } if (!flag1) { - this.teleportTo(d3, d4, d5); - return false; + // this.enderTeleportTo(d3, d4, d5); // CraftBukkit - already set the location back + return Optional.of(false); // CraftBukkit } else { if (flag) { world.broadcastEntityEvent(this, (byte) 46); @@ -3437,7 +3964,7 @@ entitycreature.getNavigation().stop(); } - return true; + return Optional.of(true); // CraftBukkit } } @@ -3530,7 +4057,7 @@ } public void stopSleeping() { - Optional optional = this.getSleepingPos(); + Optional optional = this.getSleepingPos(); // CraftBukkit - decompile error World world = this.level(); java.util.Objects.requireNonNull(world); @@ -3564,7 +4091,7 @@ @Nullable public EnumDirection getBedOrientation() { - BlockPosition blockposition = (BlockPosition) this.getSleepingPos().orElse((Object) null); + BlockPosition blockposition = (BlockPosition) this.getSleepingPos().orElse(null); // CraftBukkit - decompile error return blockposition != null ? BlockBed.getBedOrientation(this.level(), blockposition) : null; } @@ -3600,7 +4127,7 @@ FoodInfo.b foodinfo_b = (FoodInfo.b) iterator.next(); if (this.random.nextFloat() < foodinfo_b.probability()) { - this.addEffect(foodinfo_b.effect()); + this.addEffect(foodinfo_b.effect(), EntityPotionEffectEvent.Cause.FOOD); // CraftBukkit } }