Prepare for 1.19 dev
This commit is contained in:
		
					parent
					
						
							
								f34f678b20
							
						
					
				
			
			
				commit
				
					
						1148687a8d
					
				
			
		
					 1302 changed files with 120 additions and 61 deletions
				
			
		|  | @ -1,39 +0,0 @@ | |||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||||
| From: Aikar <aikar@aikar.co> | ||||
| Date: Mon, 18 Jun 2018 01:12:53 -0400 | ||||
| Subject: [PATCH] PlayerReadyArrowEvent | ||||
| 
 | ||||
| Called when a player is firing a bow and the server is choosing an arrow to use. | ||||
| Plugins can skip selection of certain arrows and control which is used. | ||||
| 
 | ||||
| diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
 | ||||
| index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 | ||||
| --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 | ||||
| +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 | ||||
| @@ -0,0 +0,0 @@ public abstract class Player extends LivingEntity {
 | ||||
|          return ImmutableList.of(Pose.STANDING, Pose.CROUCHING, Pose.SWIMMING); | ||||
|      } | ||||
|   | ||||
| +    // Paper start
 | ||||
| +    protected boolean tryReadyArrow(ItemStack bow, ItemStack itemstack) {
 | ||||
| +        return !(this instanceof ServerPlayer) ||
 | ||||
| +                new com.destroystokyo.paper.event.player.PlayerReadyArrowEvent(
 | ||||
| +                    ((ServerPlayer) this).getBukkitEntity(),
 | ||||
| +                    org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(bow),
 | ||||
| +                    org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack)
 | ||||
| +                ).callEvent();
 | ||||
| +        // Paper end
 | ||||
| +    }
 | ||||
| +
 | ||||
|      @Override | ||||
|      public ItemStack getProjectile(ItemStack stack) { | ||||
|          if (!(stack.getItem() instanceof ProjectileWeaponItem)) { | ||||
| @@ -0,0 +0,0 @@ public abstract class Player extends LivingEntity {
 | ||||
|                  for (int i = 0; i < this.inventory.getContainerSize(); ++i) { | ||||
|                      ItemStack itemstack2 = this.inventory.getItem(i); | ||||
|   | ||||
| -                    if (predicate.test(itemstack2)) {
 | ||||
| +                    if (predicate.test(itemstack2) && tryReadyArrow(stack, itemstack2)) { // Paper
 | ||||
|                          return itemstack2; | ||||
|                      } | ||||
|                  } | ||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Nassim Jahnke
				Nassim Jahnke