From f53bec077b97433c4e630fde46868e4202c93389 Mon Sep 17 00:00:00 2001 From: chickeneer Date: Wed, 8 Jun 2016 20:41:10 -0400 Subject: [PATCH] Fix Potion Equals Bug Will be in Spigot 1.10, but getting it in for 1.9 users --- .../Fix-Potion-Equals-Bug.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 Spigot-Server-Patches/Fix-Potion-Equals-Bug.patch diff --git a/Spigot-Server-Patches/Fix-Potion-Equals-Bug.patch b/Spigot-Server-Patches/Fix-Potion-Equals-Bug.patch new file mode 100644 index 0000000000..336822b155 --- /dev/null +++ b/Spigot-Server-Patches/Fix-Potion-Equals-Bug.patch @@ -0,0 +1,33 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: chickeneer +Date: Wed, 8 Jun 2016 20:39:19 -0400 +Subject: [PATCH] Fix Potion Equals Bug + +Will be in Spigot 1.10, but getting it in for 1.9 users + +diff --git a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java ++++ b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java +@@ -0,0 +0,0 @@ public class CraftPotionUtil { + .build(); + + public static String fromBukkit(PotionData data) { ++ String type; + if (data.isUpgraded()) { +- return upgradeable.get(data.getType()); ++ type = upgradeable.get(data.getType()); ++ } else if (data.isExtended()) { ++ type = extendable.get(data.getType()); ++ } else { ++ type = regular.get(data.getType()); + } +- if (data.isExtended()) { +- return extendable.get(data.getType()); +- } +- return regular.get(data.getType()); ++ return "minecraft:" + type; + } + + public static PotionData toBukkit(String type) { +-- \ No newline at end of file