mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 03:48:01 +01:00
52a05907c7
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: 97c59261 PR-1073: Make Biome an interface a38581aa Fix further javadoc errors 8271c490 Fix javadoc error 8a9ecf29 PR-1072: Fix bad naming for Vault State methods 6dd58108 PR-1071: Make Fluid an interface and add missing entry ed2cdfc3 PR-1070: Make Attribute an interface and align names with the new minecraft ones 63472efb PR-1069: Add missing winter drop experimental annotation to pale boats CraftBukkit Changes: 7235ad7b0 PR-1501: Make Biome an interface 602904003 PR-1500: Rename implementation for Vault State methods 75f26f79f PR-1499: Make Fluid an interface and add missing entry 4cfd87adc PR-1498: Make Attribute an interface and align names with the new minecraft ones 6bb0db5cb SPIGOT-7928: ExactChoice acts as MaterialChoice 3eaf3a13c SPIGOT-7929: Error when setting EquippableComponent abbf57bac SPIGOT-7930: Fix spawning entities with SummonEntityEffect 92d6ab6cf PR-1497: Move boat field rename entries to below key renaming, so that keys are also renamed abfe292aa PR-1496: Use correct Fluid class on Tags type check c7aab7fa7 SPIGOT-7923: Fix Dispenser logic to avoid firing empty projectiles
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
|