OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-25 22:10:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename item to weapon and projectile to projectile item in the event, adjust javadocs, fix using old parameter name when calling event in Player#getProjectile

Browse source
This commit is contained in:
Chaosdave34 2024-12-23 09:29:40 +01:00
parent a5facdc5bc
commit 327417dc67
2 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
paper-api/src/main/java/io/papermc/paper/event/player/PlayerUseBowWithoutProjectileEvent.java
View file

@ -8,39 +8,35 @@ import org.jetbrains.annotations.ApiStatus;
import org.jspecify.annotations.NullMarked; import org.jspecify.annotations.NullMarked;
/** /**
* Called when a player tries to draw a bow or load a crossbow without having a suitable projectile in their inventory * Called when a player tries to draw a bow or load a crossbow without having a suitable projectile item in their inventory
*/ */
@NullMarked @NullMarked
public class PlayerUseBowWithoutProjectileEvent extends PlayerEvent { public class PlayerUseBowWithoutProjectileEvent extends PlayerEvent {
private static final HandlerList HANDLER_LIST = new HandlerList(); private static final HandlerList HANDLER_LIST = new HandlerList();
private final ItemStack item; private final ItemStack weapon;
private ItemStack projectile; private ItemStack projectileItem;
@ApiStatus.Internal @ApiStatus.Internal
public PlayerUseBowWithoutProjectileEvent(final Player player, final ItemStack item) { public PlayerUseBowWithoutProjectileEvent(final Player player, final ItemStack weapon) {
super(player); super(player);
this.item = item; this.weapon = weapon;
this.projectile = ItemStack.empty(); this.projectileItem = ItemStack.empty();
} }
/** /**
* Gets the item which the player tries to use * @return The weapon wich the player tries to use
*
* @return the item
*/ */
public ItemStack getItem() { public ItemStack getWeapon() {
return item.clone(); return weapon.clone();
} }
/** /**
* Gets the projectile that should be used * @return The projectile that should be used
*
* @return the projectile
*/ */
public ItemStack getProjectile() { public ItemStack getProjectileItem() {
return projectile.clone(); return projectileItem.clone();
} }
/** /**
@ -50,8 +46,8 @@ public class PlayerUseBowWithoutProjectileEvent extends PlayerEvent {
* *
* @param projectile the projectile * @param projectile the projectile
*/ */
public void setProjectile(ItemStack projectile) { public void setProjectileItem(ItemStack projectile) {
this.projectile = projectile.clone(); this.projectileItem = projectile.clone();
} }
@Override @Override

4
paper-server/patches/sources/net/minecraft/world/entity/player/Player.java.patch
View file

@ -678,9 +678,9 @@
+ if (this.abilities.instabuild) { + if (this.abilities.instabuild) {
+ return new ItemStack(Items.ARROW); + return new ItemStack(Items.ARROW);
+ } else { + } else {
+ io.papermc.paper.event.player.PlayerUseBowWithoutProjectileEvent event = new io.papermc.paper.event.player.PlayerUseBowWithoutProjectileEvent((org.bukkit.entity.Player) getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(stack)); + io.papermc.paper.event.player.PlayerUseBowWithoutProjectileEvent event = new io.papermc.paper.event.player.PlayerUseBowWithoutProjectileEvent((org.bukkit.entity.Player) getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(shootable));
+ event.callEvent(); + event.callEvent();
+ return org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getProjectile()); + return org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getProjectileItem());
+ } + }
+ // Paper end - PlayerUseBowWithoutProjectileEvent + // Paper end - PlayerUseBowWithoutProjectileEvent
} }