From d0b64c6438c28f9dca3e9499818ddaa6b2c99162 Mon Sep 17 00:00:00 2001
From: Super_ <awesomegamer156@gmail.com>
Date: Fri, 13 Dec 2019 22:17:34 -0500
Subject: [PATCH] yet another command void fix

---
 .../totalfreedommod/blocking/EventBlocker.java    | 11 +----------
 .../totalfreedommod/command/Command_ride.java     |  6 ++++++
 .../totalfreedom/totalfreedommod/util/FUtil.java  | 15 +++++++++++++++
 .../totalfreedommod/world/WorldManager.java       | 12 ++----------
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java
index c277d4b4..1cb5c0df 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java
@@ -240,16 +240,7 @@ public class EventBlocker extends FreedomService
     @EventHandler(priority = EventPriority.NORMAL)
     public void onPlayerDeath(PlayerDeathEvent event)
     {
-        for (Player p : Bukkit.getOnlinePlayers())
-        {
-            for (Entity passengerEntity : p.getPassengers())
-            {
-                if (passengerEntity == event.getEntity())
-                {
-                    p.removePassenger(passengerEntity);
-                }
-            }
-        }
+        FUtil.fixCommandVoid(event.getEntity());
         event.setDeathMessage(event.getDeathMessage());
     }
 }
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ride.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ride.java
index 4fcfa8db..8a2a117d 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ride.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ride.java
@@ -6,6 +6,7 @@ import java.util.TimerTask;
 import me.totalfreedom.totalfreedommod.playerverification.VPlayer;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import org.bukkit.ChatColor;
+import org.bukkit.Location;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -121,6 +122,11 @@ public class Command_ride extends FreedomCommand
             return true;
         }
 
+        if (player.getWorld() != playerSender.getWorld())
+        {
+            player.teleport(new Location(player.getWorld(), 0, 256, 0));
+        }
+
         player.addPassenger(playerSender);
 
         return true;
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java b/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java
index d79f5b80..9db4a523 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java
@@ -27,6 +27,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitTask;
 import org.bukkit.Material;
@@ -473,4 +474,18 @@ public class FUtil
             return false;
         }
     }
+
+    public static void fixCommandVoid(Player player)
+    {
+        for (Player p : Bukkit.getOnlinePlayers())
+        {
+            for (Entity passengerEntity : p.getPassengers())
+            {
+                if (passengerEntity == player)
+                {
+                    p.removePassenger(passengerEntity);
+                }
+            }
+        }
+    }
 }
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/world/WorldManager.java b/src/main/java/me/totalfreedom/totalfreedommod/world/WorldManager.java
index 90dcdece..371a4d03 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/world/WorldManager.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/world/WorldManager.java
@@ -4,6 +4,7 @@ import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
@@ -162,16 +163,7 @@ public class WorldManager extends FreedomService
             return;
         }
 
-        for (Player p : Bukkit.getOnlinePlayers())
-        {
-            for (Entity passengerEntity : p.getPassengers())
-            {
-                if (passengerEntity == player)
-                {
-                    p.removePassenger(passengerEntity);
-                }
-            }
-        }
+        FUtil.fixCommandVoid(player);
 
         if (player.getWorld().getName().equalsIgnoreCase(targetWorld))
         {