Paper/Spigot-Server-Patches/0219-EndermanAttackPlayerEvent.patch

33 lines
1.4 KiB
Diff
Raw Normal View History

From ffde08dae5e5fe13d0ba9748749ade9bab3a43da Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 1 May 2018 20:18:54 -0400
Subject: [PATCH] EndermanAttackPlayerEvent
Allow control over whether or not an enderman aggros a player.
This allows you to override/extend the pumpkin/stare logic.
diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
index f279c9b148..b7c67f0cdb 100644
--- a/src/main/java/net/minecraft/server/EntityEnderman.java
+++ b/src/main/java/net/minecraft/server/EntityEnderman.java
2019-12-12 00:43:22 +01:00
@@ -141,7 +141,15 @@ public class EntityEnderman extends EntityMonster {
this.setCarried(iblockdata);
}
+ // Paper start - OBFHELPER - ok not really, but verify this on updates
private boolean f(EntityHuman entityhuman) {
2018-05-02 02:37:52 +02:00
+ boolean shouldAttack = f_real(entityhuman);
+ com.destroystokyo.paper.event.entity.EndermanAttackPlayerEvent event = new com.destroystokyo.paper.event.entity.EndermanAttackPlayerEvent((org.bukkit.entity.Enderman) getBukkitEntity(), (org.bukkit.entity.Player) entityhuman.getBukkitEntity());
2018-05-02 02:37:52 +02:00
+ event.setCancelled(!shouldAttack);
+ return event.callEvent();
+ }
+ private boolean f_real(EntityHuman entityhuman) {
+ // Paper end
ItemStack itemstack = (ItemStack) entityhuman.inventory.armor.get(3);
if (itemstack.getItem() == Blocks.CARVED_PUMPKIN.getItem()) {
--
2.26.2