mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix inverted logic on enderman attack

Browse source
This commit is contained in:
Aikar 2018-05-01 20:37:52 -04:00
parent bd603371bf
commit ef8ad1941f
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Spigot-Server-Patches/0296-EndermanAttackPlayerEvent.patch
View file

@ -1,4 +1,4 @@
From 514d84da549d03ac5c8c2ca7bc83bb4ef97c3c72 Mon Sep 17 00:00:00 2001 From be70ad267e3dbf854a44c8759f6ec8088b9c681a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 1 May 2018 20:18:54 -0400 Date: Tue, 1 May 2018 20:18:54 -0400
Subject: [PATCH] EndermanAttackPlayerEvent 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. 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 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 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
+++ b/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 { @@ -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 + // Paper start - OBFHELPER - ok not really, but verify this on updates
private boolean f(EntityHuman entityhuman) { 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()); + 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(); + return event.callEvent();
+ } + }
+ private boolean f_real(EntityHuman entityhuman) { + private boolean f_real(EntityHuman entityhuman) {