twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-05-19 13:40:24 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix PlayerSwapHandItemsEvent throwing exception when mainhand or offhand set to null

Browse Source
This commit is contained in:
Tamion 2023-09-25 19:55:51 +02:00
parent b7bb062734
commit 3c50e35f30
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
paper-api/src/main/java/org/bukkit/event/player/PlayerSwapHandItemsEvent.java
View File

@ -31,7 +31,7 @@ public class PlayerSwapHandItemsEvent extends PlayerEvent implements Cancellable
* *
* @return item in the main hand * @return item in the main hand
*/ */
@Nullable @NotNull // Paper
public ItemStack getMainHandItem() { public ItemStack getMainHandItem() {
return mainHandItem; return mainHandItem;
} }
@ -42,7 +42,7 @@ public class PlayerSwapHandItemsEvent extends PlayerEvent implements Cancellable
* @param mainHandItem new item in the main hand * @param mainHandItem new item in the main hand
*/ */
public void setMainHandItem(@Nullable ItemStack mainHandItem) { public void setMainHandItem(@Nullable ItemStack mainHandItem) {
this.mainHandItem = mainHandItem; this.mainHandItem = mainHandItem == null ? ItemStack.empty() : mainHandItem; // Paper
} }
/** /**
@ -50,7 +50,7 @@ public class PlayerSwapHandItemsEvent extends PlayerEvent implements Cancellable
* *
* @return item in the off hand * @return item in the off hand
*/ */
@Nullable @NotNull // Paper
public ItemStack getOffHandItem() { public ItemStack getOffHandItem() {
return offHandItem; return offHandItem;
} }
@ -61,7 +61,7 @@ public class PlayerSwapHandItemsEvent extends PlayerEvent implements Cancellable
* @param offHandItem new item in the off hand * @param offHandItem new item in the off hand
*/ */
public void setOffHandItem(@Nullable ItemStack offHandItem) { public void setOffHandItem(@Nullable ItemStack offHandItem) {
this.offHandItem = offHandItem; this.offHandItem = offHandItem == null ? ItemStack.empty() : offHandItem; // Paper
} }
@Override @Override