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

43 lines
1.9 KiB
Diff
Raw Normal View History

From 29e918f7337fc371af5b3d953eb016d2be8698c6 Mon Sep 17 00:00:00 2001
2019-04-30 03:20:24 +02: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
index 14a0e3d41c..6e9dd4d371 100644
2019-04-30 03:20:24 +02:00
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -2157,6 +2157,17 @@ public abstract class EntityHuman extends EntityLiving {
2019-12-12 00:43:22 +01:00
return (EntitySize) EntityHuman.b.getOrDefault(entitypose, EntityHuman.bp);
2019-04-30 03:20:24 +02:00
}
+ // 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)) {
@@ -2173,7 +2184,7 @@ public abstract class EntityHuman extends EntityLiving {
2019-04-30 03:20:24 +02: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.26.2
2019-04-30 03:20:24 +02:00