Paper/Spigot-Server-Patches/0237-PlayerReadyArrowEvent.patch

43 lines
1.9 KiB
Diff
Raw Normal View History

2019-07-20 04:01:24 +00:00
From b7b0c7f334337b6d252361e7c3e0efab9a2a9e5c Mon Sep 17 00:00:00 2001
2019-04-30 01:20:24 +00:00
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/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
2019-07-20 04:01:24 +00:00
index 494425e594..bae1cd65d0 100644
2019-04-30 01:20:24 +00:00
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
2019-07-20 04:01:24 +00:00
@@ -2051,6 +2051,17 @@ public abstract class EntityHuman extends EntityLiving {
2019-04-30 01:20:24 +00:00
return (EntitySize) EntityHuman.b.getOrDefault(entitypose, EntityHuman.bs);
}
+ // Paper start
+ protected boolean tryReadyArrow(ItemStack bow, ItemStack itemstack) {
+ return !(this instanceof EntityPlayer) ||
+ new com.destroystokyo.paper.event.player.PlayerReadyArrowEvent(
+ ((EntityPlayer) this).getBukkitEntity(),
+ org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(bow),
+ org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack)
+ ).callEvent();
+ // Paper end
+ }
+
@Override
public ItemStack f(ItemStack itemstack) {
if (!(itemstack.getItem() instanceof ItemProjectileWeapon)) {
2019-07-20 04:01:24 +00:00
@@ -2067,7 +2078,7 @@ public abstract class EntityHuman extends EntityLiving {
2019-04-30 01:20:24 +00:00
for (int i = 0; i < this.inventory.getSize(); ++i) {
ItemStack itemstack2 = this.inventory.getItem(i);
- if (predicate.test(itemstack2)) {
+ if (predicate.test(itemstack2) && tryReadyArrow(itemstack, itemstack2)) { // Paper
return itemstack2;
}
}
--
2.22.0
2019-04-30 01:20:24 +00:00