version 1.5 - also switch to Paper

This is the last CB/spigot-compatible update. Paper has made the death
event cancelable, so this plugin will use that instead of trying it's
best with the damage event and avoid the hassle of faking the
deathEvent.

Author: RoboMWM

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>to.us.tf</groupId>
     <artifactId>DeathSpectating</artifactId>
-    <version>1.4.2</version>
+    <version>1.5</version>
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>com.destroystokyo.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.12-R0.1-SNAPSHOT</version>
+            <version>1.13.1-R0.1-SNAPSHOT</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>

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

@@ -1,6 +1,7 @@
 package to.us.tf.DeathSpectating;
 
 import org.bukkit.GameMode;
+import org.bukkit.GameRule;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Particle;
@@ -28,7 +29,6 @@
 import to.us.tf.DeathSpectating.listeners.MiscListeners;
 import to.us.tf.DeathSpectating.tasks.SpectateTask;
 
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -159,8 +159,8 @@ public boolean startDeathSpectating(Player player)
 
         try
         {
-            boolean keepInventory = Boolean.valueOf(player.getWorld().getGameRuleValue("keepInventory")) || player.getGameMode() == GameMode.SPECTATOR;
-            boolean showDeathMessages = Boolean.valueOf(player.getWorld().getGameRuleValue("showDeathMessages"));
+            boolean keepInventory = player.getWorld().getGameRuleValue(GameRule.KEEP_INVENTORY) || player.getGameMode() == GameMode.SPECTATOR;
+            boolean showDeathMessages = player.getWorld().getGameRuleValue(GameRule.SHOW_DEATH_MESSAGES);
 
             /*Set spectating attributes*/
             //Player#isDead() == true when PlayerDeathEvent is fired.

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

@@ -42,7 +42,7 @@ 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)
+        if (inventory.getItemInMainHand().getType() == Material.TOTEM_OF_UNDYING || inventory.getItemInOffHand().getType() == Material.TOTEM_OF_UNDYING)
             return;
 
         //Ignore if this is probably the result of the Essentials suicide command

src/main/resources/plugin.yml

@@ -4,6 +4,7 @@ version: ${project.version}
 main: to.us.tf.DeathSpectating.DeathSpectating
 website: https://github.com/MLG-Fortress/DeathSpectating/
 softdepend: [Multiverse-Core, MultiWorld]
+api-version: 1.13
 permissions:
     deathspectating.*:
         description: Grants ALL THE THINGS