From 9a7ac8c5289bb7b1678ce5fd8506df61a43fdfad Mon Sep 17 00:00:00 2001
From: Robotia <spuri4096@gmail.com>
Date: Thu, 28 Jan 2016 23:47:26 -0500
Subject: [PATCH] Fix old GitLab issue
 (https://gitlab.prok.pw/KCauldron/KCauldron/issues/150)

---
 .../org/bukkit/craftbukkit/event/CraftEventFactory.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 6b5b9ec..8600b71 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -448,7 +448,10 @@ public class CraftEventFactory {
             DamageCause cause = DamageCause.ENTITY_ATTACK;
 
             if (source instanceof net.minecraft.util.EntityDamageSourceIndirect) {
-                damager = ((net.minecraft.util.EntityDamageSourceIndirect) source).getProximateDamageSource();
+                if (((net.minecraft.util.EntityDamageSourceIndirect) source).getSourceOfDamage() instanceof EntityPlayer)
+                    damager = ((net.minecraft.util.EntityDamageSourceIndirect) source).getSourceOfDamage();//.getProximateDamageSource();
+                else
+                    damager = ((net.minecraft.util.EntityDamageSourceIndirect) source).getProximateDamageSource();
                 // Cauldron start - vanilla compatibility
                 if (damager != null) {
                     if (damager.getBukkitEntity() instanceof ThrownPotion) {
@@ -1012,4 +1015,4 @@ public class CraftEventFactory {
         return blockBreakEvent;
     }
     // Cauldron end
-}
\ No newline at end of file
+}