mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-24 19:56:25 +00: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
51 lines
2.2 KiB
Diff
51 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
|
|
Date: Wed, 20 Mar 2024 20:42:31 -0400
|
|
Subject: [PATCH] Item Mutation Fixes
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/block/InventoryBlockStartEvent.java b/src/main/java/org/bukkit/event/block/InventoryBlockStartEvent.java
|
|
index 1ebd45295a29fbc990a1311a7f0fe7f42ac79275..b70450919e78e869c9f158c4e3e25944bcaa73f2 100644
|
|
--- a/src/main/java/org/bukkit/event/block/InventoryBlockStartEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/block/InventoryBlockStartEvent.java
|
|
@@ -17,7 +17,7 @@ import org.jetbrains.annotations.NotNull;
|
|
public class InventoryBlockStartEvent extends BlockEvent {
|
|
|
|
private static final HandlerList handlers = new HandlerList();
|
|
- private final ItemStack source;
|
|
+ protected ItemStack source; // Paper
|
|
|
|
public InventoryBlockStartEvent(@NotNull final Block block, @NotNull ItemStack source) {
|
|
super(block);
|
|
diff --git a/src/main/java/org/bukkit/event/enchantment/EnchantItemEvent.java b/src/main/java/org/bukkit/event/enchantment/EnchantItemEvent.java
|
|
index 1829529c9915937dcdd0e6d1ceba9e64819fb93f..e7c243038b70ca13b7eabdf88ce518b6198c6db9 100644
|
|
--- a/src/main/java/org/bukkit/event/enchantment/EnchantItemEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/enchantment/EnchantItemEvent.java
|
|
@@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull;
|
|
public class EnchantItemEvent extends InventoryEvent implements Cancellable {
|
|
private static final HandlerList handlers = new HandlerList();
|
|
private final Block table;
|
|
- private final ItemStack item;
|
|
+ private ItemStack item; // Paper
|
|
private int level;
|
|
private boolean cancelled;
|
|
private final Map<Enchantment, Integer> enchants;
|
|
@@ -72,6 +72,17 @@ public class EnchantItemEvent extends InventoryEvent implements Cancellable {
|
|
return item;
|
|
}
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Sets the item to be enchanted
|
|
+ *
|
|
+ * @param item item
|
|
+ */
|
|
+ public void setItem(@NotNull final ItemStack item) {
|
|
+ this.item = item;
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Gets the cost (minimum level) which is displayed as a number on the right
|
|
* hand side of the enchantment offer.
|