From 03c00f258e3999804dc101c6a258dbbd51879057 Mon Sep 17 00:00:00 2001 From: Daniel Boston Date: Thu, 21 Apr 2016 21:45:35 -0400 Subject: [PATCH] Replacing the potion data avoids the NPE and appears to avoid applying the main effect as desired. --- src/com/dre/brewery/listeners/Compat1_9.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/com/dre/brewery/listeners/Compat1_9.java b/src/com/dre/brewery/listeners/Compat1_9.java index f7a3495..9ae2b63 100644 --- a/src/com/dre/brewery/listeners/Compat1_9.java +++ b/src/com/dre/brewery/listeners/Compat1_9.java @@ -7,6 +7,8 @@ import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerItemConsumeEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.PotionMeta; +import org.bukkit.potion.PotionData; +import org.bukkit.potion.PotionType; // Workaround to remove unwanted potion effects public class Compat1_9 implements Listener { @@ -20,12 +22,10 @@ public class Compat1_9 implements Listener { } if (item.getType() == Material.POTION) { - try { - PotionMeta meta = (PotionMeta) item.getItemMeta(); - // Throw away former "base" effect and replace with MUNDANE. - meta.setBasePotionData(new PotionData(PotionType.MUNDANE, false, false)); - item.setItemMeta(meta); - } catch (Exception exception) {} + PotionMeta meta = (PotionMeta) item.getItemMeta(); + // Throw away former "base" effect and replace with MUNDANE. + meta.setBasePotionData(new PotionData(PotionType.MUNDANE, false, false)); + item.setItemMeta(meta); } }