OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-03-21 14:39:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-7811: Enchantments are applied on sweeping attack even if damage event is cancelled

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2024-07-03 20:27:36 +10:00
parent 376a4220bf
commit 80c81ef1ae
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
paper-server/nms-patches/net/minecraft/world/entity/player/EntityHuman.patch
View file

@ -287,21 +287,22 @@
if (iprojectile.deflect(ProjectileDeflection.AIM_DEFLECT, this, this, true)) { if (iprojectile.deflect(ProjectileDeflection.AIM_DEFLECT, this, this, true)) {
this.level().playSound((EntityHuman) null, this.getX(), this.getY(), this.getZ(), SoundEffects.PLAYER_ATTACK_NODAMAGE, this.getSoundSource()); this.level().playSound((EntityHuman) null, this.getX(), this.getY(), this.getZ(), SoundEffects.PLAYER_ATTACK_NODAMAGE, this.getSoundSource());
return; return;
@@ -1218,8 +1323,11 @@ @@ -1218,8 +1323,13 @@
if (entityliving2 != this && entityliving2 != entity && !this.isAlliedTo((Entity) entityliving2) && (!(entityliving2 instanceof EntityArmorStand) || !((EntityArmorStand) entityliving2).isMarker()) && this.distanceToSqr((Entity) entityliving2) < 9.0D) { if (entityliving2 != this && entityliving2 != entity && !this.isAlliedTo((Entity) entityliving2) && (!(entityliving2 instanceof EntityArmorStand) || !((EntityArmorStand) entityliving2).isMarker()) && this.distanceToSqr((Entity) entityliving2) < 9.0D) {
float f7 = this.getEnchantedDamage(entityliving2, f6, damagesource) * f2; float f7 = this.getEnchantedDamage(entityliving2, f6, damagesource) * f2;
- entityliving2.knockback(0.4000000059604645D, (double) MathHelper.sin(this.getYRot() * 0.017453292F), (double) (-MathHelper.cos(this.getYRot() * 0.017453292F)));
- entityliving2.hurt(damagesource, f7);
+ // CraftBukkit start - Only apply knockback if the damage hits + // CraftBukkit start - Only apply knockback if the damage hits
+ if (entityliving2.hurt(this.damageSources().playerAttack(this).sweep(), f7)) { + if (!entityliving2.hurt(this.damageSources().playerAttack(this).sweep(), f7)) {
+ entityliving2.knockback(0.4000000059604645D, (double) MathHelper.sin(this.getYRot() * 0.017453292F), (double) (-MathHelper.cos(this.getYRot() * 0.017453292F)), this, EntityKnockbackEvent.KnockbackCause.SWEEP_ATTACK); // CraftBukkit + continue;
+ } + }
+ // CraftBukkit end + // CraftBukkit end
entityliving2.knockback(0.4000000059604645D, (double) MathHelper.sin(this.getYRot() * 0.017453292F), (double) (-MathHelper.cos(this.getYRot() * 0.017453292F)));
- entityliving2.hurt(damagesource, f7);
+ // entityliving2.hurt(damagesource, f7); // CraftBukkit - moved up
World world = this.level(); World world = this.level();
if (world instanceof WorldServer) { if (world instanceof WorldServer) {
@@ -1235,9 +1343,26 @@ @@ -1235,9 +1345,26 @@
} }
if (entity instanceof EntityPlayer && entity.hurtMarked) { if (entity instanceof EntityPlayer && entity.hurtMarked) {
@ -328,7 +329,7 @@
} }
if (flag2) { if (flag2) {
@@ -1303,9 +1428,14 @@ @@ -1303,9 +1430,14 @@
} }
} }
@ -344,7 +345,7 @@
} }
} }
@@ -1346,7 +1476,14 @@ @@ -1346,7 +1478,14 @@
@Override @Override
public void remove(Entity.RemovalReason entity_removalreason) { public void remove(Entity.RemovalReason entity_removalreason) {
@ -360,7 +361,7 @@
this.inventoryMenu.removed(this); this.inventoryMenu.removed(this);
if (this.containerMenu != null && this.hasContainerOpen()) { if (this.containerMenu != null && this.hasContainerOpen()) {
this.doCloseContainer(); this.doCloseContainer();
@@ -1382,6 +1519,12 @@ @@ -1382,6 +1521,12 @@
} }
public Either<EntityHuman.EnumBedResult, Unit> startSleepInBed(BlockPosition blockposition) { public Either<EntityHuman.EnumBedResult, Unit> startSleepInBed(BlockPosition blockposition) {
@ -373,7 +374,7 @@
this.startSleeping(blockposition); this.startSleeping(blockposition);
this.sleepCounter = 0; this.sleepCounter = 0;
return Either.right(Unit.INSTANCE); return Either.right(Unit.INSTANCE);
@@ -1444,9 +1587,9 @@ @@ -1444,9 +1589,9 @@
super.jumpFromGround(); super.jumpFromGround();
this.awardStat(StatisticList.JUMP); this.awardStat(StatisticList.JUMP);
if (this.isSprinting()) { if (this.isSprinting()) {
@ -385,7 +386,7 @@
} }
} }
@@ -1473,7 +1616,11 @@ @@ -1473,7 +1618,11 @@
this.setDeltaMovement(vec3d2.x, d0 * 0.6D, vec3d2.z); this.setDeltaMovement(vec3d2.x, d0 * 0.6D, vec3d2.z);
this.resetFallDistance(); this.resetFallDistance();
@ -398,7 +399,7 @@
} else { } else {
super.travel(vec3d); super.travel(vec3d);
} }
@@ -1547,12 +1694,24 @@ @@ -1547,12 +1696,24 @@
} }
public void startFallFlying() { public void startFallFlying() {
@ -424,7 +425,7 @@
} }
@Override @Override
@@ -1667,10 +1826,21 @@ @@ -1667,10 +1828,21 @@
return this.experienceLevel >= 30 ? 112 + (this.experienceLevel - 30) * 9 : (this.experienceLevel >= 15 ? 37 + (this.experienceLevel - 15) * 5 : 7 + this.experienceLevel * 2); return this.experienceLevel >= 30 ? 112 + (this.experienceLevel - 30) * 9 : (this.experienceLevel >= 15 ? 37 + (this.experienceLevel - 15) * 5 : 7 + this.experienceLevel * 2);
} }
@ -447,7 +448,7 @@
} }
} }
@@ -1756,13 +1926,20 @@ @@ -1756,13 +1928,20 @@
@Override @Override
public void setItemSlot(EnumItemSlot enumitemslot, ItemStack itemstack) { public void setItemSlot(EnumItemSlot enumitemslot, ItemStack itemstack) {
@ -471,7 +472,7 @@
} }
} }
@@ -1806,26 +1983,31 @@ @@ -1806,26 +1985,31 @@
protected void removeEntitiesOnShoulder() { protected void removeEntitiesOnShoulder() {
if (this.timeEntitySatOnShoulder + 20L < this.level().getGameTime()) { if (this.timeEntitySatOnShoulder + 20L < this.level().getGameTime()) {
@ -511,7 +512,7 @@
} }
@Override @Override
@@ -2040,7 +2222,7 @@ @@ -2040,7 +2224,7 @@
@Override @Override
public ItemStack eat(World world, ItemStack itemstack, FoodInfo foodinfo) { public ItemStack eat(World world, ItemStack itemstack, FoodInfo foodinfo) {