From 44bae8ab00da75f31b0d7ef52523a4e8dd82ffd0 Mon Sep 17 00:00:00 2001 From: Allink Date: Thu, 13 Oct 2022 19:53:04 +0100 Subject: [PATCH] Remove /sit command FS-460 --- .../totalfreedom/totalfreedommod/Sitter.java | 34 ------------------ .../totalfreedommod/TotalFreedomMod.java | 2 -- .../totalfreedommod/command/Command_sit.java | 35 ------------------- 3 files changed, 71 deletions(-) delete mode 100644 src/main/java/me/totalfreedom/totalfreedommod/Sitter.java delete mode 100644 src/main/java/me/totalfreedom/totalfreedommod/command/Command_sit.java diff --git a/src/main/java/me/totalfreedom/totalfreedommod/Sitter.java b/src/main/java/me/totalfreedom/totalfreedommod/Sitter.java deleted file mode 100644 index b90fd260..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/Sitter.java +++ /dev/null @@ -1,34 +0,0 @@ -package me.totalfreedom.totalfreedommod; - -import me.totalfreedom.totalfreedommod.command.Command_sit; -import org.bukkit.entity.ArmorStand; -import org.bukkit.entity.Entity; -import org.bukkit.event.EventHandler; -import org.spigotmc.event.entity.EntityDismountEvent; - -public class Sitter extends FreedomService -{ - @Override - public void onStart() - { - } - - @Override - public void onStop() - { - } - - @EventHandler - public void onEntityDismount(EntityDismountEvent e) - { - Entity dm = e.getDismounted(); - if (dm instanceof ArmorStand) - { - if (Command_sit.STANDS.contains(dm)) - { - Command_sit.STANDS.remove(dm); - dm.remove(); - } - } - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java b/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java index bcab4b04..d18fb0b9 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java @@ -118,7 +118,6 @@ public class TotalFreedomMod extends JavaPlugin public HTTPDaemon hd; public WorldRestrictions wr; public EntityWiper ew; - public Sitter st; public VanishHandler vh; public Pterodactyl ptero; // @@ -312,7 +311,6 @@ public class TotalFreedomMod extends JavaPlugin pem = new PermissionManager(); gr = new GameRuleHandler(); ew = new EntityWiper(); - st = new Sitter(); vh = new VanishHandler(); ptero = new Pterodactyl(); } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_sit.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_sit.java deleted file mode 100644 index f54b677d..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_sit.java +++ /dev/null @@ -1,35 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import java.util.ArrayList; -import java.util.List; -import me.totalfreedom.totalfreedommod.rank.Rank; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.ArmorStand; -import org.bukkit.entity.EntityType; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Sit at the current place you are at.", usage = "/") -public class Command_sit extends FreedomCommand -{ - public static List STANDS = new ArrayList<>(); - - public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole) - { - if (args.length != 0) - { - return false; - } - - ArmorStand stand = (ArmorStand)playerSender.getWorld().spawnEntity(playerSender.getLocation().clone().subtract(0.0, 1.7, 0.0), EntityType.ARMOR_STAND); - stand.setGravity(false); - stand.setAI(false); - stand.setVisible(false); - stand.setInvulnerable(true); - stand.addPassenger(playerSender); - STANDS.add(stand); - msg("You are now sitting."); - return true; - } -} \ No newline at end of file