57dd397155
Upstream has released updates that appears 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: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes: 77fd87e4 SPIGOT-2304: Implement LootGenerateEvent a1a705ee SPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent 41712edd SPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
25 lines
1.1 KiB
Diff
25 lines
1.1 KiB
Diff
From 920ba75d50b484e75fb3b746365ecc476135ca5b Mon Sep 17 00:00:00 2001
|
|
From: Wesley Smith <me@wesjd.net>
|
|
Date: Fri, 24 Apr 2020 18:30:26 -0400
|
|
Subject: [PATCH] Fix Potion#toItemStack swapping the extended and upgraded
|
|
constructor values.
|
|
|
|
While the Potion class is deprecated, it is still used in some plugins for cross-version potion handling. This issue has existed for a long time, and has caused many heaches along the way.
|
|
|
|
diff --git a/src/main/java/org/bukkit/potion/Potion.java b/src/main/java/org/bukkit/potion/Potion.java
|
|
index b9dbbfd07..ac02ae4fc 100644
|
|
--- a/src/main/java/org/bukkit/potion/Potion.java
|
|
+++ b/src/main/java/org/bukkit/potion/Potion.java
|
|
@@ -267,7 +267,7 @@ public class Potion {
|
|
}
|
|
ItemStack itemStack = new ItemStack(material, amount);
|
|
PotionMeta meta = (PotionMeta) itemStack.getItemMeta();
|
|
- meta.setBasePotionData(new PotionData(type, level == 2, extended));
|
|
+ meta.setBasePotionData(new PotionData(type, extended, level == 2)); // Paper - fix swapped values
|
|
itemStack.setItemMeta(meta);
|
|
return itemStack;
|
|
}
|
|
--
|
|
2.26.2
|
|
|