From ef8ad1941ff7ec37b807e2d29fe9202d58f2ef33 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 May 2018 20:37:52 -0400 Subject: [PATCH] fix inverted logic on enderman attack --- .../0296-EndermanAttackPlayerEvent.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Spigot-Server-Patches/0296-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0296-EndermanAttackPlayerEvent.patch index b9bfc44b9..a414ef6d0 100644 --- a/Spigot-Server-Patches/0296-EndermanAttackPlayerEvent.patch +++ b/Spigot-Server-Patches/0296-EndermanAttackPlayerEvent.patch @@ -1,4 +1,4 @@ -From 514d84da549d03ac5c8c2ca7bc83bb4ef97c3c72 Mon Sep 17 00:00:00 2001 +From be70ad267e3dbf854a44c8759f6ec8088b9c681a Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 May 2018 20:18:54 -0400 Subject: [PATCH] EndermanAttackPlayerEvent @@ -8,7 +8,7 @@ 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 +index 6ebfb12fb..6fc337706 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 { @@ -17,9 +17,9 @@ index 6ebfb12fb..f0da99d87 100644 + // Paper start - OBFHELPER - ok not really, but verify this on updates private boolean f(EntityHuman entityhuman) { -+ boolean cancel = f_real(entityhuman); ++ 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()); -+ event.setCancelled(cancel); ++ event.setCancelled(!shouldAttack); + return event.callEvent(); + } + private boolean f_real(EntityHuman entityhuman) {