From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> Date: Sun, 18 Sep 2022 13:10:18 -0400 Subject: [PATCH] Add PrePlayerAttackEntityEvent diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java index 3cc67435ea3407865da8ca2c04c25fa18f101534..b89a1f42283fbc7699b6c85bbb7efbd9cd9646ed 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -1256,8 +1256,17 @@ public abstract class Player extends LivingEntity { } public void attack(Entity target) { - if (target.isAttackable()) { - if (!target.skipAttackInteraction(this)) { + // Paper start - PlayerAttackEntityEvent + boolean willAttack = target.isAttackable() && !target.skipAttackInteraction(this); // Vanilla logic + io.papermc.paper.event.player.PrePlayerAttackEntityEvent playerAttackEntityEvent = new io.papermc.paper.event.player.PrePlayerAttackEntityEvent( + (org.bukkit.entity.Player) this.getBukkitEntity(), + target.getBukkitEntity(), + willAttack + ); + + if (playerAttackEntityEvent.callEvent() && willAttack) { // Logic moved to willAttack local variable. + { + // Paper end - PlayerAttackEntityEvent float f = this.isAutoSpinAttack() ? this.autoSpinAttackDmg : (float) this.getAttributeValue(Attributes.ATTACK_DAMAGE); ItemStack itemstack = this.getWeaponItem(); DamageSource damagesource = this.damageSources().playerAttack(this);