-
-
Notifications
You must be signed in to change notification settings - Fork 3.2k
Add PlayerUseBowWithoutProjectileEvent #11774
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Chaosdave34
wants to merge
12
commits into
PaperMC:main
from
Chaosdave34:feat/PlayerUseBowWithoutProjectileEvent
Closed
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
847e878
Add PlayerUseBowWithoutProjectileEvent
Chaosdave34 a5facdc
Shorter comments
Chaosdave34 327417d
Rename item to weapon and projectile to projectile item in the event,…
Chaosdave34 7e42544
Add PlayerUseBowWithoutProjectileEvent
Chaosdave34 e705b44
Shorter comments
Chaosdave34 c2e96c1
Rename item to weapon and projectile to projectile item in the event,…
Chaosdave34 2cd2de5
Merge remote-tracking branch 'origin/feat/PlayerUseBowWithoutProjecti…
Chaosdave34 c5edd0f
Merge branch 'main' into feat/PlayerUseBowWithoutProjectileEvent
Chaosdave34 7501401
Add missing patch file
Chaosdave34 7667ce5
Merge branch 'main' into feat/PlayerUseBowWithoutProjectileEvent
Chaosdave34 75bd6c8
Fix conflicts
Chaosdave34 1f86b97
Update Player.java.patch
Chaosdave34 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
65 changes: 65 additions & 0 deletions
65
...r-api/src/main/java/io/papermc/paper/event/player/PlayerUseBowWithoutProjectileEvent.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| package io.papermc.paper.event.player; | ||
|
|
||
| import org.bukkit.entity.Player; | ||
| import org.bukkit.event.HandlerList; | ||
| import org.bukkit.event.player.PlayerEvent; | ||
| import org.bukkit.inventory.ItemStack; | ||
| import org.jetbrains.annotations.ApiStatus; | ||
| 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 | ||
| */ | ||
| @NullMarked | ||
| public class PlayerUseBowWithoutProjectileEvent extends PlayerEvent { | ||
|
|
||
| private static final HandlerList HANDLER_LIST = new HandlerList(); | ||
|
|
||
| private final ItemStack item; | ||
| private ItemStack projectile; | ||
|
|
||
| @ApiStatus.Internal | ||
| public PlayerUseBowWithoutProjectileEvent(final Player player, final ItemStack item) { | ||
| super(player); | ||
| this.item = item; | ||
| this.projectile = ItemStack.empty(); | ||
| } | ||
|
|
||
| /** | ||
| * Gets the item which the player tries to use | ||
| * | ||
| * @return the item | ||
| */ | ||
| public ItemStack getItem() { | ||
| return item.clone(); | ||
| } | ||
|
|
||
| /** | ||
| * Gets the projectile that should be used | ||
| * | ||
| * @return the projectile | ||
| */ | ||
| public ItemStack getProjectile() { | ||
| return projectile.clone(); | ||
| } | ||
|
|
||
| /** | ||
| * Sets the projectile that should be used | ||
| * <p> | ||
| * Note: setting this to {@link ItemStack#empty()} will prevent the player from using the bow/crossbow | ||
| * | ||
| * @param projectile the projectile | ||
| */ | ||
| public void setProjectile(ItemStack projectile) { | ||
| this.projectile = projectile.clone(); | ||
| } | ||
Chaosdave34 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| @Override | ||
| public HandlerList getHandlers() { | ||
| return HANDLER_LIST; | ||
| } | ||
|
|
||
| public static HandlerList getHandlerList() { | ||
| return HANDLER_LIST; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because this event is only specific to bows, I think that this should be getBowItem() or something more specific
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We might be able to find a better name I guess, but certainly not related to bows xD
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I meant bows, which applies to both crossbows/bow. But not sure, maybe leave as is then.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Guess something like
weapon item?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Cant you use anything as "bow" now?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe just getWeapon()?