2018-12-15 02:17:27 +01:00
|
|
|
From 53f0c76aa8b97792b8279381a85ccaf2fa690725 Mon Sep 17 00:00:00 2001
|
2018-05-02 02:19:47 +02:00
|
|
|
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
|
2018-12-15 02:17:27 +01:00
|
|
|
index d4f7805bb..d5c55d50e 100644
|
2018-05-02 02:19:47 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityEnderman.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityEnderman.java
|
2018-07-19 01:16:19 +02:00
|
|
|
@@ -135,7 +135,15 @@ public class EntityEnderman extends EntityMonster {
|
2018-05-02 02:19:47 +02:00
|
|
|
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);
|
2018-05-02 02:19:47 +02:00
|
|
|
+ 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);
|
2018-05-02 02:19:47 +02:00
|
|
|
+ return event.callEvent();
|
|
|
|
+ }
|
|
|
|
+ private boolean f_real(EntityHuman entityhuman) {
|
|
|
|
+ // Paper end
|
|
|
|
ItemStack itemstack = (ItemStack) entityhuman.inventory.armor.get(3);
|
|
|
|
|
2018-07-19 01:16:19 +02:00
|
|
|
if (itemstack.getItem() == Blocks.CARVED_PUMPKIN.getItem()) {
|
2018-05-02 02:19:47 +02:00
|
|
|
--
|
2018-12-15 02:17:27 +01:00
|
|
|
2.20.0
|
2018-05-02 02:19:47 +02:00
|
|
|
|