1.4.2 Allow all deathspectating-related teleports

Turns out the teleport listener was canceling the teleports, so yea....

Author: RoboMWM

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>to.us.tf</groupId>
     <artifactId>DeathSpectating</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2</version>
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>

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

@@ -38,14 +38,14 @@ void onPlayerTryToTeleportWhenDead(PlayerTeleportEvent event)
     {
         if (!instance.isSpectating(event.getPlayer()))
             return;
-        try
+
+        //Only allow "death spectating" teleports to occur
+        if (event.getCause() == PlayerTeleportEvent.TeleportCause.PLUGIN && event.getPlayer().hasMetadata("DS_TP"))
         {
-            //Only allow "death spectating" teleports to occur
-            if (event.getCause() == PlayerTeleportEvent.TeleportCause.PLUGIN && event.getFrom().distanceSquared(event.getTo()) == 0)
-                return;
+            event.getPlayer().removeMetadata("DS_TP", instance);
+            return;
         }
-        catch (IllegalArgumentException e) //If trying to teleport to another world, yes of course stop that
-        {}
+
         event.setCancelled(true);
     }
 

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

@@ -3,6 +3,7 @@
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
+import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
 import to.us.tf.DeathSpectating.DeathSpectating;
@@ -40,7 +41,7 @@ public SpectateTask(Player player, long ticks, @Nullable Entity killer, DeathSpe
         this.unformattedTitle = deathSpectating.getConfigManager().getDeathTitle("titles");
         this.unformattedSubTitle = deathSpectating.getConfigManager().getDeathTitle("subtitles");
         this.score = player.getTotalExperience();
-        this.deathLocation = player.getLocation().clone();
+        this.deathLocation = player.getLocation();
     }
 
     public Player getPlayer()
@@ -134,18 +135,24 @@ public void run()
         if (preventMovement && killer != null && killer.isValid() && !killer.isDead() && killer.getWorld() == player.getWorld())
         {
             vector = killer.getLocation().toVector().subtract(deathLocation.toVector());
-            player.teleport(deathLocation.setDirection(vector));
+            teleportPlayer(deathLocation.setDirection(vector));
             player.setFlySpeed(0f);
             player.setSpectatorTarget(null);
         }
         else if (preventMovement)
         {
             if (deathLocation.distanceSquared(player.getLocation()) > 1)
-                player.teleport(deathLocation.setDirection(player.getLocation().getDirection()));
+                teleportPlayer(deathLocation.setDirection(player.getLocation().getDirection()));
             player.setFlySpeed(0f);
             player.setSpectatorTarget(null);
         }
 
         ticks--;
     }
+
+    public void teleportPlayer(Location location)
+    {
+        player.setMetadata("DS_TP", new FixedMetadataValue(instance, true));
+        player.teleport(location);
+    }
 }