Prepare for 1.20.3 dev
This commit is contained in:
parent
1fa2b7d2f5
commit
46f4547805
1514 changed files with 10 additions and 12 deletions
|
@ -1,47 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Tamion <70228790+notTamion@users.noreply.github.com>
|
||||
Date: Mon, 25 Sep 2023 19:55:51 +0200
|
||||
Subject: [PATCH] Fix PlayerSwapHandItemsEvent throwing exception when mainhand
|
||||
or offhand set to null
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/event/player/PlayerSwapHandItemsEvent.java b/src/main/java/org/bukkit/event/player/PlayerSwapHandItemsEvent.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/org/bukkit/event/player/PlayerSwapHandItemsEvent.java
|
||||
+++ b/src/main/java/org/bukkit/event/player/PlayerSwapHandItemsEvent.java
|
||||
@@ -0,0 +0,0 @@ public class PlayerSwapHandItemsEvent extends PlayerEvent implements Cancellable
|
||||
*
|
||||
* @return item in the main hand
|
||||
*/
|
||||
- @Nullable
|
||||
+ @NotNull // Paper
|
||||
public ItemStack getMainHandItem() {
|
||||
return mainHandItem;
|
||||
}
|
||||
@@ -0,0 +0,0 @@ public class PlayerSwapHandItemsEvent extends PlayerEvent implements Cancellable
|
||||
* @param mainHandItem new item in the main hand
|
||||
*/
|
||||
public void setMainHandItem(@Nullable ItemStack mainHandItem) {
|
||||
- this.mainHandItem = mainHandItem;
|
||||
+ this.mainHandItem = mainHandItem == null ? ItemStack.empty() : mainHandItem; // Paper
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -0,0 +0,0 @@ public class PlayerSwapHandItemsEvent extends PlayerEvent implements Cancellable
|
||||
*
|
||||
* @return item in the off hand
|
||||
*/
|
||||
- @Nullable
|
||||
+ @NotNull // Paper
|
||||
public ItemStack getOffHandItem() {
|
||||
return offHandItem;
|
||||
}
|
||||
@@ -0,0 +0,0 @@ public class PlayerSwapHandItemsEvent extends PlayerEvent implements Cancellable
|
||||
* @param offHandItem new item in the off hand
|
||||
*/
|
||||
public void setOffHandItem(@Nullable ItemStack offHandItem) {
|
||||
- this.offHandItem = offHandItem;
|
||||
+ this.offHandItem = offHandItem == null ? ItemStack.empty() : offHandItem; // Paper
|
||||
}
|
||||
|
||||
@Override
|
Loading…
Add table
Add a link
Reference in a new issue