From de55bb4164e8002ba7a0b4498eb8e4428f91eb65 Mon Sep 17 00:00:00 2001 From: okx-code Date: Tue, 14 Apr 2026 17:19:22 +0100 Subject: [PATCH] remove bsd --- PrivateConfig | 2 +- .../src/main/java/isaac/bastion/Bastion.java | 1 - .../java/isaac/bastion/commands/PlayersStates.java | 2 +- .../bastion/listeners/BastionInteractListener.java | 13 ------------- plugins/bastion-paper/src/main/resources/plugin.yml | 4 ---- 5 files changed, 2 insertions(+), 20 deletions(-) diff --git a/PrivateConfig b/PrivateConfig index e87f3346c..2941940e8 160000 --- a/PrivateConfig +++ b/PrivateConfig @@ -1 +1 @@ -Subproject commit e87f3346c8d8fd90c5bbef8ab91ad89bc3cb9bb4 +Subproject commit 2941940e8d892f4b82c921d868bdf8cdf9670bfa diff --git a/plugins/bastion-paper/src/main/java/isaac/bastion/Bastion.java b/plugins/bastion-paper/src/main/java/isaac/bastion/Bastion.java index 96517e5da..20f3f77ae 100644 --- a/plugins/bastion-paper/src/main/java/isaac/bastion/Bastion.java +++ b/plugins/bastion-paper/src/main/java/isaac/bastion/Bastion.java @@ -124,7 +124,6 @@ public final class Bastion extends ACivMod { context -> new ArrayList<>(BastionType.getTypeNames())); commandManager.registerCommand(new BastionCommandManager()); getCommand("bsi").setExecutor(new ModeChangeCommand(Mode.INFO)); - getCommand("bsd").setExecutor(new ModeChangeCommand(Mode.DELETE)); getCommand("bso").setExecutor(new ModeChangeCommand(Mode.NORMAL)); getCommand("bsb").setExecutor(new ModeChangeCommand(Mode.BASTION)); getCommand("bsf").setExecutor(new ModeChangeCommand(Mode.OFF)); diff --git a/plugins/bastion-paper/src/main/java/isaac/bastion/commands/PlayersStates.java b/plugins/bastion-paper/src/main/java/isaac/bastion/commands/PlayersStates.java index c5f4801a8..9805f1166 100644 --- a/plugins/bastion-paper/src/main/java/isaac/bastion/commands/PlayersStates.java +++ b/plugins/bastion-paper/src/main/java/isaac/bastion/commands/PlayersStates.java @@ -10,7 +10,7 @@ import org.bukkit.entity.Player; public class PlayersStates { static public enum Mode { - NORMAL, INFO, DELETE, OFF, BASTION, MATURE + NORMAL, INFO, OFF, BASTION, MATURE } static private Map playersModes = new HashMap<>(); diff --git a/plugins/bastion-paper/src/main/java/isaac/bastion/listeners/BastionInteractListener.java b/plugins/bastion-paper/src/main/java/isaac/bastion/listeners/BastionInteractListener.java index dec2b73d8..f8e311ddc 100644 --- a/plugins/bastion-paper/src/main/java/isaac/bastion/listeners/BastionInteractListener.java +++ b/plugins/bastion-paper/src/main/java/isaac/bastion/listeners/BastionInteractListener.java @@ -85,19 +85,6 @@ public class BastionInteractListener implements Listener { TextComponent toSend = blockManager.infoMessageComponent(dev, block.getRelative(event.getBlockFace()), block, player); player.spigot().sendMessage(toSend); - } else if (PlayersStates.playerInMode(player, Mode.DELETE)) { - BastionBlock bastionBlock = blockStorage.getBastionBlock(block.getLocation()); - - if (bastionBlock == null) { - return; - } - - if (bastionBlock.canRemove(player)) { - TextComponent toSend = blockManager.bastionDeletedMessageComponent(bastionBlock); - bastionBlock.destroy(); - player.spigot().sendMessage(toSend); - event.setCancelled(true); - } } else if (PlayersStates.playerInMode(player, Mode.MATURE)) { BastionBlock bastionBlock = blockStorage.getBastionBlock(block.getLocation()); diff --git a/plugins/bastion-paper/src/main/resources/plugin.yml b/plugins/bastion-paper/src/main/resources/plugin.yml index 069cfef8a..6703aecbf 100644 --- a/plugins/bastion-paper/src/main/resources/plugin.yml +++ b/plugins/bastion-paper/src/main/resources/plugin.yml @@ -11,10 +11,6 @@ commands: description: Gives info on blocks that are clicked usage: /bsi and right click a block permission: Bastion.normal - bsd: - description: Removes Bastion Block when clicked - usage: /bsd and right click a block - permission: Bastion.normal bso: description: Returns to normal usage: /bso set the mode back to normal