Fixing usage of RedUtilities

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/Game.java

@@ -46,10 +46,10 @@ import de.butzlabben.missilewars.listener.game.GameBoundListener;
 import de.butzlabben.missilewars.listener.game.GameListener;
 import de.butzlabben.missilewars.listener.game.LobbyListener;
 import de.butzlabben.missilewars.player.MWPlayer;
-import de.butzlabben.missilewars.util.PlayerUtil;
 import de.butzlabben.missilewars.util.geometry.GameArea;
 import de.butzlabben.missilewars.util.geometry.Geometry;
 import de.butzlabben.missilewars.util.serialization.Serializer;
+import de.redstoneworld.redutilities.player.Teleport;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -732,19 +732,19 @@ public class Game {
     }
 
     public void teleportToFallbackSpawn(Player player) {
-        PlayerUtil.teleportSafely(player, Config.getFallbackSpawn());
+        Teleport.teleportSafely(player, Config.getFallbackSpawn());
     }
 
     public void teleportToLobbySpawn(Player player) {
-        PlayerUtil.teleportSafely(player, lobby.getSpawnPoint());
+        Teleport.teleportSafely(player, lobby.getSpawnPoint());
     }
 
     public void teleportToArenaSpectatorSpawn(Player player) {
-        PlayerUtil.teleportSafely(player, arena.getSpectatorSpawn());
+        Teleport.teleportSafely(player, arena.getSpectatorSpawn());
     }
 
     public void teleportToAfterGameSpawn(Player player) {
-        PlayerUtil.teleportSafely(player, lobby.getAfterGameSpawn());
+        Teleport.teleportSafely(player, lobby.getAfterGameSpawn());
     }
     
     /**

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/Team.java

@@ -25,8 +25,8 @@ import de.butzlabben.missilewars.game.enums.TeamType;
 import de.butzlabben.missilewars.game.misc.TeamSpawnProtection;
 import de.butzlabben.missilewars.menus.MenuItem;
 import de.butzlabben.missilewars.player.MWPlayer;
-import de.butzlabben.missilewars.util.PlayerUtil;
 import de.butzlabben.missilewars.util.version.ColorConverter;
+import de.redstoneworld.redutilities.player.Teleport;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
@@ -174,7 +174,7 @@ public class Team {
     
     public void teleportToTeamSpawn(Player player) {
         TeamSpawnProtection.regenerateSpawn(this);
-        PlayerUtil.teleportSafely(player, spawn);
+        Teleport.teleportSafely(player, spawn);
     }
     
 }

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/timer/GameTimer.java

@@ -22,7 +22,7 @@ import de.butzlabben.missilewars.configuration.Config;
 import de.butzlabben.missilewars.configuration.PluginMessages;
 import de.butzlabben.missilewars.game.Game;
 import de.butzlabben.missilewars.game.enums.TeamType;
-import de.butzlabben.missilewars.util.PlayerUtil;
+import de.redstoneworld.redutilities.player.Messages;
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
 
@@ -99,7 +99,7 @@ public class GameTimer extends Timer {
                 Player player = mwPlayer.getPlayer();
                 
                 if (mwPlayer.getTeam().getTeamType() == TeamType.PLAYER) return;
-                PlayerUtil.sendActionbarMsg(player, Config.getActionbarForSpecEntries()[actionbarMsgCounter]);
+                Messages.sendActionbarMsg(player, Config.getActionbarForSpecEntries()[actionbarMsgCounter]);
             });
             
             // Array-Iteration: