Revert "Update MoveToCMD.java (#119)"

This reverts commit 40b7c8c.
FancyMcPlugins · Aug 2, 2024 · 7c56316 · 7c56316
1 parent 2c2b2e3
commit 7c56316
Showing 1 changed file with 17 additions and 37 deletions.
diff --git a/src/main/java/de/oliver/fancyholograms/commands/hologram/MoveToCMD.java b/src/main/java/de/oliver/fancyholograms/commands/hologram/MoveToCMD.java
@@ -3,9 +3,7 @@
 import de.oliver.fancyholograms.api.hologram.Hologram;
 import de.oliver.fancyholograms.commands.Subcommand;
 import de.oliver.fancylib.MessageHelper;
-import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -16,73 +14,55 @@
 public class MoveToCMD implements Subcommand {
 
     @Override
-    public List<String> tabcompletion(@NotNull CommandSender sender, @Nullable Hologram hologram, @NotNull String[] args) {
+    public List<String> tabcompletion(@NotNull CommandSender player, @Nullable Hologram hologram, @NotNull String[] args) {
         return null;
     }
 
     @Override
     public boolean run(@NotNull CommandSender sender, @Nullable Hologram hologram, @NotNull String[] args) {
-        if (hologram == null) {
-            MessageHelper.error(sender, "Hologram not found");
+        if (!(sender instanceof Player player)) {
+            MessageHelper.error(sender, "You must be a sender to use this command");
             return false;
         }
 
-        World world;
-        int argOffset;
-        if (sender instanceof Player player) {
-            world = player.getWorld();
-            argOffset = 0;
-        } else {
-            if (args.length < 4) {
-                MessageHelper.error(sender, "You must specify the world when using this command from the console");
-                return false;
-            }
-            world = Bukkit.getWorld(args[0]);
-            if (world == null) {
-                MessageHelper.error(sender, "World not found");
-                return false;
-            }
-            argOffset = 1;
-        }
-
-        if (args.length < 3 + argOffset) {
-            MessageHelper.error(sender, "Wrong usage: /hologram help");
+        if (args.length < 3) {
+            MessageHelper.error(player, "Wrong usage: /hologram help");
             return false;
         }
 
-        final var x = MoveHereCMD.calculateCoordinate(args[1 + argOffset], hologram.getData().getLocation(), null, Location::getX);
-        final var y = MoveHereCMD.calculateCoordinate(args[2 + argOffset], hologram.getData().getLocation(), null, Location::getY);
-        final var z = MoveHereCMD.calculateCoordinate(args[3 + argOffset], hologram.getData().getLocation(), null, Location::getZ);
+        final var x = MoveHereCMD.calculateCoordinate(args[3], hologram.getData().getLocation(), player.getLocation(), Location::x);
+        final var y = MoveHereCMD.calculateCoordinate(args[4], hologram.getData().getLocation(), player.getLocation(), Location::y);
+        final var z = MoveHereCMD.calculateCoordinate(args[5], hologram.getData().getLocation(), player.getLocation(), Location::z);
 
         if (x == null || y == null || z == null) {
-            MessageHelper.error(sender, "Could not parse position");
+            MessageHelper.error(player, "Could not parse position");
             return false;
         }
 
-        final var location = new Location(world, x, y, z, hologram.getData().getLocation().getYaw(), hologram.getData().getLocation().getPitch());
+        final var location = new Location(player.getWorld(), x, y, z, hologram.getData().getLocation().getYaw(), hologram.getData().getLocation().getPitch());
 
-        if (args.length > 4 + argOffset) {
-            final var yaw = MoveHereCMD.calculateCoordinate(args[4 + argOffset], hologram.getData().getLocation(), null, loc -> loc.getYaw() + 180f);
+        if (args.length > 6) {
+            final var yaw = MoveHereCMD.calculateCoordinate(args[6], hologram.getData().getLocation(), player.getLocation(), loc -> loc.getYaw() + 180f);
 
             if (yaw == null) {
-                MessageHelper.error(sender, "Could not parse yaw");
+                MessageHelper.error(player, "Could not parse yaw");
                 return false;
             }
 
             location.setYaw(yaw.floatValue() - 180f);
         }
 
-        if (args.length > 5 + argOffset) {
-            final var pitch = MoveHereCMD.calculateCoordinate(args[5 + argOffset], hologram.getData().getLocation(), null, Location::getPitch);
+        if (args.length > 7) {
+            final var pitch = MoveHereCMD.calculateCoordinate(args[7], hologram.getData().getLocation(), player.getLocation(), Location::getPitch);
 
             if (pitch == null) {
-                MessageHelper.error(sender, "Could not parse pitch");
+                MessageHelper.error(player, "Could not parse pitch");
                 return false;
             }
 
             location.setPitch(pitch.floatValue());
         }
 
-        return MoveHereCMD.setLocation(sender, hologram, location, true);
+        return MoveHereCMD.setLocation(player, hologram, location, true);
     }
 }