PaperMC/Spigot-Server-Patches/0226-EndermanAttackPlayerEvent.patch

33 lines
1.4 KiB
Diff
Raw Normal View History

2019-05-06 04:58:04 +02:00
From 41b5bd130d90b9f3454e69599c857c9a6ac89a18 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
2019-05-06 04:58:04 +02:00
index e441fa234d..a1033ce28b 100644
--- a/src/main/java/net/minecraft/server/EntityEnderman.java
+++ b/src/main/java/net/minecraft/server/EntityEnderman.java
2019-04-29 05:14:31 +02:00
@@ -138,7 +138,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.21.0