From 75819fac2d7e17d161a2177cfaf0365afec8afd0 Mon Sep 17 00:00:00 2001 From: Wesley Smith Date: Fri, 24 Apr 2020 19:01:45 -0400 Subject: [PATCH] Fix Potion#toItemStack swapping the extended and upgraded constructor values (#3216) --- ...mStack-swapping-the-extended-and-upg.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 Spigot-API-Patches/0199-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch diff --git a/Spigot-API-Patches/0199-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch b/Spigot-API-Patches/0199-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch new file mode 100644 index 000000000..cb7111e11 --- /dev/null +++ b/Spigot-API-Patches/0199-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch @@ -0,0 +1,24 @@ +From d3956af4031ab5e1a451429c49d6923bcf932bf7 Mon Sep 17 00:00:00 2001 +From: Wesley Smith +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 b9dbbfd0..ac02ae4f 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.21.0 (Apple Git-122) +