mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-04 22:14:40 +01:00
30 lines
1.6 KiB
Diff
30 lines
1.6 KiB
Diff
|
From 0000000000000000000000000000000000000000 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/world/entity/monster/EntityEnderman.java b/src/main/java/net/minecraft/world/entity/monster/EntityEnderman.java
|
||
|
|
index ef2f0211cd4d20dad0d3757c38c3c2882e99b2f2..aa6cb15637144c9d8db1b1861e58f3f02d68357a 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/EntityEnderman.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/EntityEnderman.java
|
||
|
|
@@ -221,7 +221,15 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable {
|
||
|
|
this.a((WorldServer) this.world, nbttagcompound);
|
||
|
|
}
|
||
|
|
|
||
|
|
+ // Paper start - OBFHELPER - ok not really, but verify this on updates
|
||
|
|
private boolean g(EntityHuman entityhuman) {
|
||
|
|
+ boolean shouldAttack = g_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(!shouldAttack);
|
||
|
|
+ return event.callEvent();
|
||
|
|
+ }
|
||
|
|
+ private boolean g_real(EntityHuman entityhuman) {
|
||
|
|
+ // Paper end
|
||
|
|
ItemStack itemstack = (ItemStack) entityhuman.inventory.armor.get(3);
|
||
|
|
|
||
|
|
if (itemstack.getItem() == Blocks.CARVED_PUMPKIN.getItem()) {
|