From 6f96c90d9d0baf29dfe167fe1f20b678adb6b72d Mon Sep 17 00:00:00 2001 From: bloodshot Date: Thu, 9 Apr 2020 17:59:46 -0400 Subject: [PATCH] Add support to clear claim names. Fixes #158 --- .../com/griefdefender/command/CommandClaimFarewell.java | 2 +- .../com/griefdefender/command/CommandClaimGreeting.java | 2 +- .../java/com/griefdefender/command/CommandClaimName.java | 6 +++--- .../com/griefdefender/command/CommandClaimFarewell.java | 2 +- .../com/griefdefender/command/CommandClaimGreeting.java | 2 +- .../java/com/griefdefender/command/CommandClaimName.java | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bukkit/src/main/java/com/griefdefender/command/CommandClaimFarewell.java b/bukkit/src/main/java/com/griefdefender/command/CommandClaimFarewell.java index c068bfc..9529a5a 100644 --- a/bukkit/src/main/java/com/griefdefender/command/CommandClaimFarewell.java +++ b/bukkit/src/main/java/com/griefdefender/command/CommandClaimFarewell.java @@ -50,7 +50,7 @@ public class CommandClaimFarewell extends BaseCommand { @CommandAlias("claimfarewell") @Description("Sets the farewell message of your claim.") - @Syntax("") + @Syntax("|clear") @Subcommand("claim farewell") public void execute(Player player, String message) { final GDPlayerData playerData = GriefDefenderPlugin.getInstance().dataStore.getOrCreatePlayerData(player.getWorld(), player.getUniqueId()); diff --git a/bukkit/src/main/java/com/griefdefender/command/CommandClaimGreeting.java b/bukkit/src/main/java/com/griefdefender/command/CommandClaimGreeting.java index 164a16b..73fd77b 100644 --- a/bukkit/src/main/java/com/griefdefender/command/CommandClaimGreeting.java +++ b/bukkit/src/main/java/com/griefdefender/command/CommandClaimGreeting.java @@ -50,7 +50,7 @@ public class CommandClaimGreeting extends BaseCommand { @CommandAlias("claimgreeting") @Description("Sets the greeting message of your claim.") - @Syntax("") + @Syntax("|clear") @Subcommand("claim greeting") public void execute(Player player, String message) { final GDPlayerData playerData = GriefDefenderPlugin.getInstance().dataStore.getOrCreatePlayerData(player.getWorld(), player.getUniqueId()); diff --git a/bukkit/src/main/java/com/griefdefender/command/CommandClaimName.java b/bukkit/src/main/java/com/griefdefender/command/CommandClaimName.java index 21e29fb..fe2d8d8 100644 --- a/bukkit/src/main/java/com/griefdefender/command/CommandClaimName.java +++ b/bukkit/src/main/java/com/griefdefender/command/CommandClaimName.java @@ -52,7 +52,7 @@ public class CommandClaimName extends BaseCommand { @CommandAlias("claimname") - @Syntax("") + @Syntax("|clear") @Description("Sets the name of your claim.") @Subcommand("claim name") public void execute(Player player, String name) { @@ -74,8 +74,8 @@ public void execute(Player player, String name) { } } - final Component text = LegacyComponentSerializer.legacy().deserialize(name, '&'); - if (text == TextComponent.empty()) { + final TextComponent text = LegacyComponentSerializer.legacy().deserialize(name, '&'); + if (text == TextComponent.empty() || text.content().equals("clear")) { claim.getInternalClaimData().setName(null); } else { claim.getInternalClaimData().setName(text); diff --git a/sponge/src/main/java/com/griefdefender/command/CommandClaimFarewell.java b/sponge/src/main/java/com/griefdefender/command/CommandClaimFarewell.java index 706f80d..a90f75b 100644 --- a/sponge/src/main/java/com/griefdefender/command/CommandClaimFarewell.java +++ b/sponge/src/main/java/com/griefdefender/command/CommandClaimFarewell.java @@ -49,7 +49,7 @@ public class CommandClaimFarewell extends BaseCommand { @CommandAlias("claimfarewell") @Description("Sets the farewell message of your claim.") - @Syntax("") + @Syntax("|clear") @Subcommand("claim farewell") public void execute(Player player, String message) { final GDPlayerData playerData = GriefDefenderPlugin.getInstance().dataStore.getOrCreatePlayerData(player.getWorld(), player.getUniqueId()); diff --git a/sponge/src/main/java/com/griefdefender/command/CommandClaimGreeting.java b/sponge/src/main/java/com/griefdefender/command/CommandClaimGreeting.java index 85165fb..2c4cc78 100644 --- a/sponge/src/main/java/com/griefdefender/command/CommandClaimGreeting.java +++ b/sponge/src/main/java/com/griefdefender/command/CommandClaimGreeting.java @@ -49,7 +49,7 @@ public class CommandClaimGreeting extends BaseCommand { @CommandAlias("claimgreeting") @Description("Sets the greeting message of your claim.") - @Syntax("") + @Syntax("|clear") @Subcommand("claim greeting") public void execute(Player player, String message) { final GDPlayerData playerData = GriefDefenderPlugin.getInstance().dataStore.getOrCreatePlayerData(player.getWorld(), player.getUniqueId()); diff --git a/sponge/src/main/java/com/griefdefender/command/CommandClaimName.java b/sponge/src/main/java/com/griefdefender/command/CommandClaimName.java index f476f68..ff0c7fd 100644 --- a/sponge/src/main/java/com/griefdefender/command/CommandClaimName.java +++ b/sponge/src/main/java/com/griefdefender/command/CommandClaimName.java @@ -50,7 +50,7 @@ public class CommandClaimName extends BaseCommand { @CommandAlias("claimname") - @Syntax("") + @Syntax("|clear") @Description("Sets the name of your claim.") @Subcommand("claim name") public void execute(Player player, String name) { @@ -72,8 +72,8 @@ public void execute(Player player, String name) { } } - final Component text = LegacyComponentSerializer.legacy().deserialize(name, '&'); - if (text == TextComponent.empty()) { + final TextComponent text = LegacyComponentSerializer.legacy().deserialize(name, '&'); + if (text == TextComponent.empty() || text.content().equals("clear")) { claim.getInternalClaimData().setName(null); } else { claim.getInternalClaimData().setName(text);