33 lines
1.4 KiB
Diff
33 lines
1.4 KiB
Diff
|
From 514d84da549d03ac5c8c2ca7bc83bb4ef97c3c72 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 6ebfb12fb..f0da99d87 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/EntityEnderman.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/EntityEnderman.java
|
||
|
|
@@ -149,7 +149,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) {
|
||
|
|
+ boolean cancel = 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());
|
||
|
|
+ event.setCancelled(cancel);
|
||
|
|
+ return event.callEvent();
|
||
|
|
+ }
|
||
|
|
+ private boolean f_real(EntityHuman entityhuman) {
|
||
|
|
+ // Paper end
|
||
|
|
ItemStack itemstack = (ItemStack) entityhuman.inventory.armor.get(3);
|
||
|
|
|
||
|
|
if (itemstack.getItem() == Item.getItemOf(Blocks.PUMPKIN)) {
|
||
|
|
--
|
||
|
|
2.17.0
|
||
|
|
|