From ded7fd5bdf509922bebb5f0819da2f9834b3601f Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Mon, 13 Jul 2020 10:53:36 -0700
Subject: [PATCH] Potion NPE fix

---
 Changelog.txt                                                 | 3 +++
 src/main/java/com/gmail/nossr50/listeners/EntityListener.java | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/Changelog.txt b/Changelog.txt
index 57abaea1c..1a88cc01b 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,3 +1,6 @@
+Version 2.1.134
+    Fixed a NPE that could happen with thrown potions
+
 Version 2.1.133
     A fix for an 'array out of bounds' error related to players clicking outside the inventory windows has been fixed
     French locale has been updated (thanks Elikill58)
diff --git a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
index 5b79227ba..7a6ff5bc0 100644
--- a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
@@ -1061,6 +1061,9 @@ public class EntityListener implements Listener {
         if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
             return;
 
+        if(event.getPotion().getItem().getItemMeta() == null)
+            return;
+
         for (PotionEffect effect : ((PotionMeta) event.getPotion().getItem().getItemMeta()).getCustomEffects()) {
             if (!effect.getType().equals(PotionEffectType.SATURATION)) {
                 return;