2021-06-11 14:02:28 +02:00
|
|
|
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
|
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10277)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent
258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor
ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD
CraftBukkit Changes:
98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire
a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent
5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class
76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor
Spigot Changes:
e9ec5485 Rebuild patches
f1b62e0c Rebuild patches
2024-02-23 14:37:33 +01:00
|
|
|
index b97a3c78ef2fc2865817ca2166f87a8d6e19055c..0bff92eeade590852b9b37105a18df35f587559b 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
|
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10277)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent
258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor
ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD
CraftBukkit Changes:
98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire
a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent
5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class
76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor
Spigot Changes:
e9ec5485 Rebuild patches
f1b62e0c Rebuild patches
2024-02-23 14:37:33 +01:00
|
|
|
@@ -2176,18 +2176,29 @@ public abstract class Player extends LivingEntity {
|
2021-06-11 14:02:28 +02:00
|
|
|
return ImmutableList.of(Pose.STANDING, Pose.CROUCHING, Pose.SWIMMING);
|
|
|
|
}
|
|
|
|
|
2024-01-21 19:37:09 +01:00
|
|
|
+ // Paper start - PlayerReadyArrowEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
+ 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();
|
|
|
|
+ }
|
2024-01-21 19:37:09 +01:00
|
|
|
+ // Paper end - PlayerReadyArrowEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
|
|
|
@Override
|
|
|
|
public ItemStack getProjectile(ItemStack stack) {
|
|
|
|
if (!(stack.getItem() instanceof ProjectileWeaponItem)) {
|
2023-02-13 10:36:25 +01:00
|
|
|
return ItemStack.EMPTY;
|
|
|
|
} else {
|
|
|
|
- Predicate<ItemStack> predicate = ((ProjectileWeaponItem) stack.getItem()).getSupportedHeldProjectiles();
|
2024-01-21 19:37:09 +01:00
|
|
|
+ Predicate<ItemStack> predicate = ((ProjectileWeaponItem) stack.getItem()).getSupportedHeldProjectiles().and(item -> tryReadyArrow(stack, item)); // Paper - PlayerReadyArrowEvent
|
2023-02-13 10:36:25 +01:00
|
|
|
ItemStack itemstack1 = ProjectileWeaponItem.getHeldProjectile(this, predicate);
|
|
|
|
|
|
|
|
if (!itemstack1.isEmpty()) {
|
|
|
|
return itemstack1;
|
|
|
|
} else {
|
|
|
|
- predicate = ((ProjectileWeaponItem) stack.getItem()).getAllSupportedProjectiles();
|
2024-01-21 19:37:09 +01:00
|
|
|
+ predicate = ((ProjectileWeaponItem) stack.getItem()).getAllSupportedProjectiles().and(item -> tryReadyArrow(stack, item)); // Paper - PlayerReadyArrowEvent
|
2023-02-13 10:36:25 +01:00
|
|
|
|
2021-06-11 14:02:28 +02:00
|
|
|
for (int i = 0; i < this.inventory.getContainerSize(); ++i) {
|
|
|
|
ItemStack itemstack2 = this.inventory.getItem(i);
|