mirror of
https://github.com/PaperMC/Paper.git
synced 2025-05-25 20:10:27 +00:00
f00727c57e
Co-authored-by: Bjarne Koll <git@lynxplay.dev> Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com> Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Co-authored-by: MiniDigger | Martin <admin@minidigger.dev> Co-authored-by: Nassim Jahnke <nassim@njahnke.dev> Co-authored-by: Noah van der Aa <ndvdaa@gmail.com> Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> Co-authored-by: Shane Freeder <theboyetronic@gmail.com> Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com> Co-authored-by: Tamion <70228790+notTamion@users.noreply.github.com> Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com>
27 lines
1.7 KiB
Diff
27 lines
1.7 KiB
Diff
--- a/net/minecraft/world/item/MaceItem.java
|
|
+++ b/net/minecraft/world/item/MaceItem.java
|
|
@@ -52,7 +_,13 @@
|
|
|
|
@Override
|
|
public void hurtEnemy(ItemStack stack, LivingEntity target, LivingEntity attacker) {
|
|
- if (canSmashAttack(attacker)) {
|
|
+ // Paper start - Add EntityAttemptSmashAttackEvent
|
|
+ final boolean canSmashAttack = canSmashAttack(attacker);
|
|
+ io.papermc.paper.event.entity.EntityAttemptSmashAttackEvent event = new io.papermc.paper.event.entity.EntityAttemptSmashAttackEvent(attacker.getBukkitLivingEntity(), target.getBukkitLivingEntity(), stack.asBukkitCopy(), canSmashAttack);
|
|
+ event.callEvent();
|
|
+ final org.bukkit.event.Event.Result result = event.getResult();
|
|
+ if (result == org.bukkit.event.Event.Result.ALLOW || (canSmashAttack && result == org.bukkit.event.Event.Result.DEFAULT)) {
|
|
+ // Paper end - Add EntityAttemptSmashAttackEvent
|
|
ServerLevel serverLevel = (ServerLevel)attacker.level();
|
|
attacker.setDeltaMovement(attacker.getDeltaMovement().with(Direction.Axis.Y, 0.01F));
|
|
if (attacker instanceof ServerPlayer serverPlayer) {
|
|
@@ -127,7 +_,7 @@
|
|
double knockbackPower = getKnockbackPower(attacker, livingEntity, vec3);
|
|
Vec3 vec31 = vec3.normalize().scale(knockbackPower);
|
|
if (knockbackPower > 0.0) {
|
|
- livingEntity.push(vec31.x, 0.7F, vec31.z);
|
|
+ livingEntity.push(vec31.x, 0.7F, vec31.z, attacker); // Paper - Add EntityKnockbackByEntityEvent and EntityPushedByEntityAttackEvent
|
|
if (livingEntity instanceof ServerPlayer serverPlayer) {
|
|
serverPlayer.connection.send(new ClientboundSetEntityMotionPacket(serverPlayer));
|
|
}
|