40 lines
2.0 KiB
Diff
40 lines
2.0 KiB
Diff
|
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 552920f59aae9de2cad3edcdc8c48a91dff49093..b88d8f2c377322290002e84e217f3f2f6e4e71e8 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
|
||
|
|
@@ -2139,6 +2139,17 @@ 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)) {
|
||
|
|
@@ -2155,7 +2166,7 @@ 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;
|
||
|
|
}
|
||
|
|
}
|