aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0767-Add-PrePlayerAttackEntityEvent.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0767-Add-PrePlayerAttackEntityEvent.patch')
-rw-r--r--patches/server/0767-Add-PrePlayerAttackEntityEvent.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/patches/server/0767-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0767-Add-PrePlayerAttackEntityEvent.patch
new file mode 100644
index 0000000000..b0f3a07890
--- /dev/null
+++ b/patches/server/0767-Add-PrePlayerAttackEntityEvent.patch
@@ -0,0 +1,30 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Owen1212055 <[email protected]>
+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 fab56040ecf496e74f583ec5d6c6c9861cfa4e13..ad334f149fe1b44d4ebe48489dcd2811ff1b5cd0 100644
+--- a/src/main/java/net/minecraft/world/entity/player/Player.java
++++ b/src/main/java/net/minecraft/world/entity/player/Player.java
+@@ -1257,8 +1257,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);