core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0261-EndermanAttackPlayerEv...

33 lines
1.4 KiB
Diff
Raw Normal View History

[Auto] Update Upstream Upstream has released updates that appear to apply compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing. Bukkit Changes: d2834556 SPIGOT-4219: Event for PigZombies angering. CraftBukkit Changes: a9c796f1 SPIGOT-4184: Fix furnaces not matching Vanilla smelt or animations 195f071e SPIGOT-4219: Event for PigZombies angering. 5e3082c7 SPIGOT-4230: Improve legacy block types
2018-08-05 23:46:43 +00:00
From a2696a78ce247412f99754292f111edd3c29aa28 Mon Sep 17 00:00:00 2001
EndermanAttackPlayerEvent Allow control over whether or not an enderman aggros a player. This allows you to override/extend the pumpkin/stare logic.
2018-05-02 00:19:47 +00: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
Update B/CB/S
2018-07-23 08:39:55 +00:00
index 0f64c8f2b5..2db0eb4946 100644
EndermanAttackPlayerEvent Allow control over whether or not an enderman aggros a player. This allows you to override/extend the pumpkin/stare logic.
2018-05-02 00:19:47 +00:00
--- a/src/main/java/net/minecraft/server/EntityEnderman.java
+++ b/src/main/java/net/minecraft/server/EntityEnderman.java
NOT FINISHED! 1.13 pre-7 I need more creative commit messages.
2018-07-18 23:16:19 +00:00
@@ -135,7 +135,15 @@ public class EntityEnderman extends EntityMonster {
EndermanAttackPlayerEvent Allow control over whether or not an enderman aggros a player. This allows you to override/extend the pumpkin/stare logic.
2018-05-02 00:19:47 +00:00
this.setCarried(iblockdata);
}
+ // Paper start - OBFHELPER - ok not really, but verify this on updates
private boolean f(EntityHuman entityhuman) {
fix inverted logic on enderman attack
2018-05-02 00:37:52 +00:00
+ boolean shouldAttack = f_real(entityhuman);
EndermanAttackPlayerEvent Allow control over whether or not an enderman aggros a player. This allows you to override/extend the pumpkin/stare logic.
2018-05-02 00:19:47 +00: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());
fix inverted logic on enderman attack
2018-05-02 00:37:52 +00:00
+ event.setCancelled(!shouldAttack);
EndermanAttackPlayerEvent Allow control over whether or not an enderman aggros a player. This allows you to override/extend the pumpkin/stare logic.
2018-05-02 00:19:47 +00:00
+ return event.callEvent();
+ }
+ private boolean f_real(EntityHuman entityhuman) {
+ // Paper end
ItemStack itemstack = (ItemStack) entityhuman.inventory.armor.get(3);
NOT FINISHED! 1.13 pre-7 I need more creative commit messages.
2018-07-18 23:16:19 +00:00
if (itemstack.getItem() == Blocks.CARVED_PUMPKIN.getItem()) {
EndermanAttackPlayerEvent Allow control over whether or not an enderman aggros a player. This allows you to override/extend the pumpkin/stare logic.
2018-05-02 00:19:47 +00:00
--
Fix issues with getBlockState(false) not loading Tile Entity data This only impacted people who used our useSnapshots new API in a plugin, which obviously was no one as the data result was completely broken. Merged the NPE check patch into mine since it has to handle it too.
2018-06-30 05:40:52 +00:00
2.18.0
EndermanAttackPlayerEvent Allow control over whether or not an enderman aggros a player. This allows you to override/extend the pumpkin/stare logic.
2018-05-02 00:19:47 +00:00