mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-15 08:28:01 +02:00
71c84c8132
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
48 lines
1.9 KiB
Diff
48 lines
1.9 KiB
Diff
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 9f592317c920589c22a5fb8e916c6ca58ebe5c59..39dd08de71b8b52fe3462c105ecdbfc1cd2cd9a3 100644
|
|
--- a/src/main/java/org/bukkit/event/player/PlayerSwapHandItemsEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/player/PlayerSwapHandItemsEvent.java
|
|
@@ -31,7 +31,7 @@ public class PlayerSwapHandItemsEvent extends PlayerEvent implements Cancellable
|
|
*
|
|
* @return item in the main hand
|
|
*/
|
|
- @Nullable
|
|
+ @NotNull // Paper
|
|
public ItemStack getMainHandItem() {
|
|
return mainHandItem;
|
|
}
|
|
@@ -42,7 +42,7 @@ 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
|
|
}
|
|
|
|
/**
|
|
@@ -50,7 +50,7 @@ public class PlayerSwapHandItemsEvent extends PlayerEvent implements Cancellable
|
|
*
|
|
* @return item in the off hand
|
|
*/
|
|
- @Nullable
|
|
+ @NotNull // Paper
|
|
public ItemStack getOffHandItem() {
|
|
return offHandItem;
|
|
}
|
|
@@ -61,7 +61,7 @@ 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
|