--- a/net/minecraft/world/entity/animal/EntityWolf.java +++ b/net/minecraft/world/entity/animal/EntityWolf.java @@ -90,6 +90,13 @@ import net.minecraft.world.level.pathfinder.PathType; import net.minecraft.world.phys.Vec3D; +// CraftBukkit start +import org.bukkit.event.entity.EntityDamageEvent; +import org.bukkit.event.entity.EntityRegainHealthEvent; +import org.bukkit.event.entity.EntityTargetEvent; +import org.bukkit.craftbukkit.event.CraftEventFactory; +// CraftBukkit end + public class EntityWolf extends EntityTameableAnimal implements IEntityAngerable, VariantHolder> { private static final DataWatcherObject DATA_INTERESTED_ID = DataWatcher.defineId(EntityWolf.class, DataWatcherRegistry.BOOLEAN); @@ -360,11 +367,14 @@ if (this.isInvulnerableTo(damagesource)) { return false; } else { - if (!this.level().isClientSide) { + // CraftBukkit start + boolean result = super.hurt(damagesource, f); + if (!this.level().isClientSide && result) { + // CraftBukkit end this.setOrderedToSit(false); } - return super.hurt(damagesource, f); + return result; // CraftBukkit } } @@ -374,10 +384,15 @@ } @Override - protected void actuallyHurt(DamageSource damagesource, float f) { + public boolean actuallyHurt(DamageSource damagesource, float f, EntityDamageEvent event) { // CraftBukkit - void -> boolean if (!this.canArmorAbsorb(damagesource)) { - super.actuallyHurt(damagesource, f); + return super.actuallyHurt(damagesource, f, event); // CraftBukkit } else { + // CraftBukkit start - SPIGOT-7815: if the damage was cancelled, no need to run the wolf armor behaviour + if (event.isCancelled()) { + return false; + } + // CraftBukkit end ItemStack itemstack = this.getBodyArmorItem(); int i = itemstack.getDamageValue(); int j = itemstack.getMaxDamage(); @@ -395,6 +410,7 @@ } } + return false; // CraftBukkit } private boolean canArmorAbsorb(DamageSource damagesource) { @@ -405,7 +421,7 @@ protected void applyTamingSideEffects() { if (this.isTame()) { this.getAttribute(GenericAttributes.MAX_HEALTH).setBaseValue(40.0D); - this.setHealth(40.0F); + this.setHealth(this.getMaxHealth()); // CraftBukkit - 40.0 -> getMaxHealth() } else { this.getAttribute(GenericAttributes.MAX_HEALTH).setBaseValue(8.0D); } @@ -432,7 +448,7 @@ FoodInfo foodinfo = (FoodInfo) itemstack.get(DataComponents.FOOD); float f = foodinfo != null ? (float) foodinfo.nutrition() : 1.0F; - this.heal(2.0F * f); + this.heal(2.0F * f, EntityRegainHealthEvent.RegainReason.EATING); // CraftBukkit return EnumInteractionResult.sidedSuccess(this.level().isClientSide()); } else { if (item instanceof ItemDye) { @@ -463,7 +479,9 @@ this.playSound(SoundEffects.ARMOR_UNEQUIP_WOLF); itemstack1 = this.getBodyArmorItem(); this.setBodyArmorItem(ItemStack.EMPTY); + this.forceDrops = true; // CraftBukkit this.spawnAtLocation(itemstack1); + this.forceDrops = false; // CraftBukkit return EnumInteractionResult.SUCCESS; } else if (((RecipeItemStack) ((ArmorMaterial) EnumArmorMaterial.ARMADILLO.value()).repairIngredient().get()).test(itemstack) && this.isInSittingPose() && this.hasArmor() && this.isOwnedBy(entityhuman) && this.getBodyArmorItem().isDamaged()) { itemstack.shrink(1); @@ -480,7 +498,7 @@ this.setOrderedToSit(!this.isOrderedToSit()); this.jumping = false; this.navigation.stop(); - this.setTarget((EntityLiving) null); + this.setTarget((EntityLiving) null, EntityTargetEvent.TargetReason.FORGOT_TARGET, true); // CraftBukkit - reason return EnumInteractionResult.SUCCESS_NO_ITEM_USED; } else { return enuminteractionresult; @@ -498,7 +516,8 @@ } private void tryToTame(EntityHuman entityhuman) { - if (this.random.nextInt(3) == 0) { + // CraftBukkit - added event call and isCancelled check. + if (this.random.nextInt(3) == 0 && !CraftEventFactory.callEntityTameEvent(this, entityhuman).isCancelled()) { this.tame(entityhuman); this.navigation.stop(); this.setTarget((EntityLiving) null);