1.10 and below compatibility(?) and fix for items with vanishing curse

Author: RoboMWM

src/main/java/to/us/tf/DeathSpectating/CompatUtil.java

@@ -0,0 +1,29 @@
+package to.us.tf.DeathSpectating;
+
+import org.bukkit.Bukkit;
+
+/**
+ * Created on 2/27/2017.
+ *
+ * @author RoboMWM
+ */
+public class CompatUtil
+{
+    public static boolean isNewer()
+    {
+        String version = Bukkit.getBukkitVersion();
+        version = version.substring(2);
+        version = version.substring(0, version.indexOf("."));
+        int versionNumber;
+        try
+        {
+            versionNumber = Integer.valueOf(version);
+        }
+        catch (Exception e)
+        {
+            Bukkit.getLogger().warning("[DeathSpectating] Was not able to determine bukkit version.");
+            return false;
+        }
+        return versionNumber > 11;
+    }
+}

src/main/java/to/us/tf/DeathSpectating/DeathSpectating.java

@@ -162,7 +162,7 @@ public boolean startDeathSpectating(Player player)
                 //Compile a list of null-free/air-free items to drop
                 for (ItemStack itemStack : player.getInventory().getContents())
                 {
-                    if (itemStack != null && itemStack.getType() != Material.AIR && itemStack.containsEnchantment(Enchantment.VANISHING_CURSE))
+                    if (itemStack != null && itemStack.getType() != Material.AIR && !itemStack.containsEnchantment(Enchantment.VANISHING_CURSE))
                         itemsToDrop.add(itemStack);
                 }
             }

src/main/java/to/us/tf/DeathSpectating/listeners/DamageListener.java

@@ -9,6 +9,7 @@
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.PlayerInventory;
+import to.us.tf.DeathSpectating.CompatUtil;
 import to.us.tf.DeathSpectating.DeathSpectating;
 
 /**
@@ -41,8 +42,16 @@ void onPlayerBasicallyWouldBeDead(EntityDamageEvent event)
 
         //Ignore if player is holding a totem of undying
         PlayerInventory inventory = player.getInventory();
-        if (inventory.getItemInMainHand().getType() == Material.TOTEM || inventory.getItemInOffHand().getType() == Material.TOTEM)
-            return;
+        try
+        {
+            if (inventory.getItemInMainHand().getType() == Material.TOTEM || inventory.getItemInOffHand().getType() == Material.TOTEM)
+                return;
+        }
+        catch (Exception e) //1.10 and lower "compatibility"
+        {
+            if (CompatUtil.isNewer()) return;
+            else throw e;
+        }
 
         //Ignore if this is probably the result of the Essentials suicide command
         //Essentials will perform Player#setHealth(0), which does not fire a damage event, but does kill the player. This will lead to a double death message.
@@ -51,6 +60,7 @@ void onPlayerBasicallyWouldBeDead(EntityDamageEvent event)
             return;
 
         player.setLastDamageCause(event);
+        //TODO: fire EntityResurrectEvent
 
         /*Put player in death spectating mode*/
         if (instance.startDeathSpectating(player))