aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/unapplied/api/0192-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/unapplied/api/0192-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch')
-rw-r--r--patches/unapplied/api/0192-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/patches/unapplied/api/0192-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch b/patches/unapplied/api/0192-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
new file mode 100644
index 0000000000..2fa02a7788
--- /dev/null
+++ b/patches/unapplied/api/0192-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Wesley Smith <[email protected]>
+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 266547c6da0e3270af5c9ca81268934294a7c48d..69e7ce61090e3e3a7a337a96b380c8ffe78ffb8d 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;
+ }