Prepare for 1.19 dev
This commit is contained in:
		
					parent
					
						
							
								f34f678b20
							
						
					
				
			
			
				commit
				
					
						1148687a8d
					
				
			
		
					 1302 changed files with 120 additions and 61 deletions
				
			
		|  | @ -1,30 +0,0 @@ | |||
| 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/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 | ||||
| index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 | ||||
| --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 | ||||
| +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 | ||||
| @@ -0,0 +0,0 @@ public class EnderMan extends Monster implements NeutralMob {
 | ||||
|          this.readPersistentAngerSaveData(this.level, nbt); | ||||
|      } | ||||
|   | ||||
| -    boolean isLookingAtMe(Player player) {
 | ||||
| +    // Paper start - EndermanAttackPlayerEvent
 | ||||
| +    private boolean isLookingAtMe(Player player) {
 | ||||
| +        boolean shouldAttack = isLookingAtMe_check(player);
 | ||||
| +        com.destroystokyo.paper.event.entity.EndermanAttackPlayerEvent event = new com.destroystokyo.paper.event.entity.EndermanAttackPlayerEvent((org.bukkit.entity.Enderman) getBukkitEntity(), (org.bukkit.entity.Player) player.getBukkitEntity());
 | ||||
| +        event.setCancelled(!shouldAttack);
 | ||||
| +        return event.callEvent();
 | ||||
| +    }
 | ||||
| +    private boolean isLookingAtMe_check(Player player) {
 | ||||
| +        // Paper end
 | ||||
|          ItemStack itemstack = (ItemStack) player.getInventory().armor.get(3); | ||||
|   | ||||
|          if (itemstack.is(Blocks.CARVED_PUMPKIN.asItem())) { | ||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Nassim Jahnke
				Nassim Jahnke