mirror of
https://github.com/bloodmc/GriefDefender.git
synced 2024-09-28 04:37:35 +02:00
Add support to clear claim names. Fixes #158
This commit is contained in:
parent
d043037d26
commit
6f96c90d9d
@ -50,7 +50,7 @@ public class CommandClaimFarewell extends BaseCommand {
|
|||||||
|
|
||||||
@CommandAlias("claimfarewell")
|
@CommandAlias("claimfarewell")
|
||||||
@Description("Sets the farewell message of your claim.")
|
@Description("Sets the farewell message of your claim.")
|
||||||
@Syntax("<message>")
|
@Syntax("<message>|clear")
|
||||||
@Subcommand("claim farewell")
|
@Subcommand("claim farewell")
|
||||||
public void execute(Player player, String message) {
|
public void execute(Player player, String message) {
|
||||||
final GDPlayerData playerData = GriefDefenderPlugin.getInstance().dataStore.getOrCreatePlayerData(player.getWorld(), player.getUniqueId());
|
final GDPlayerData playerData = GriefDefenderPlugin.getInstance().dataStore.getOrCreatePlayerData(player.getWorld(), player.getUniqueId());
|
||||||
|
@ -50,7 +50,7 @@ public class CommandClaimGreeting extends BaseCommand {
|
|||||||
|
|
||||||
@CommandAlias("claimgreeting")
|
@CommandAlias("claimgreeting")
|
||||||
@Description("Sets the greeting message of your claim.")
|
@Description("Sets the greeting message of your claim.")
|
||||||
@Syntax("<message>")
|
@Syntax("<message>|clear")
|
||||||
@Subcommand("claim greeting")
|
@Subcommand("claim greeting")
|
||||||
public void execute(Player player, String message) {
|
public void execute(Player player, String message) {
|
||||||
final GDPlayerData playerData = GriefDefenderPlugin.getInstance().dataStore.getOrCreatePlayerData(player.getWorld(), player.getUniqueId());
|
final GDPlayerData playerData = GriefDefenderPlugin.getInstance().dataStore.getOrCreatePlayerData(player.getWorld(), player.getUniqueId());
|
||||||
|
@ -52,7 +52,7 @@
|
|||||||
public class CommandClaimName extends BaseCommand {
|
public class CommandClaimName extends BaseCommand {
|
||||||
|
|
||||||
@CommandAlias("claimname")
|
@CommandAlias("claimname")
|
||||||
@Syntax("<name>")
|
@Syntax("<name>|clear")
|
||||||
@Description("Sets the name of your claim.")
|
@Description("Sets the name of your claim.")
|
||||||
@Subcommand("claim name")
|
@Subcommand("claim name")
|
||||||
public void execute(Player player, String 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, '&');
|
final TextComponent text = LegacyComponentSerializer.legacy().deserialize(name, '&');
|
||||||
if (text == TextComponent.empty()) {
|
if (text == TextComponent.empty() || text.content().equals("clear")) {
|
||||||
claim.getInternalClaimData().setName(null);
|
claim.getInternalClaimData().setName(null);
|
||||||
} else {
|
} else {
|
||||||
claim.getInternalClaimData().setName(text);
|
claim.getInternalClaimData().setName(text);
|
||||||
|
@ -49,7 +49,7 @@ public class CommandClaimFarewell extends BaseCommand {
|
|||||||
|
|
||||||
@CommandAlias("claimfarewell")
|
@CommandAlias("claimfarewell")
|
||||||
@Description("Sets the farewell message of your claim.")
|
@Description("Sets the farewell message of your claim.")
|
||||||
@Syntax("<message>")
|
@Syntax("<message>|clear")
|
||||||
@Subcommand("claim farewell")
|
@Subcommand("claim farewell")
|
||||||
public void execute(Player player, String message) {
|
public void execute(Player player, String message) {
|
||||||
final GDPlayerData playerData = GriefDefenderPlugin.getInstance().dataStore.getOrCreatePlayerData(player.getWorld(), player.getUniqueId());
|
final GDPlayerData playerData = GriefDefenderPlugin.getInstance().dataStore.getOrCreatePlayerData(player.getWorld(), player.getUniqueId());
|
||||||
|
@ -49,7 +49,7 @@ public class CommandClaimGreeting extends BaseCommand {
|
|||||||
|
|
||||||
@CommandAlias("claimgreeting")
|
@CommandAlias("claimgreeting")
|
||||||
@Description("Sets the greeting message of your claim.")
|
@Description("Sets the greeting message of your claim.")
|
||||||
@Syntax("<message>")
|
@Syntax("<message>|clear")
|
||||||
@Subcommand("claim greeting")
|
@Subcommand("claim greeting")
|
||||||
public void execute(Player player, String message) {
|
public void execute(Player player, String message) {
|
||||||
final GDPlayerData playerData = GriefDefenderPlugin.getInstance().dataStore.getOrCreatePlayerData(player.getWorld(), player.getUniqueId());
|
final GDPlayerData playerData = GriefDefenderPlugin.getInstance().dataStore.getOrCreatePlayerData(player.getWorld(), player.getUniqueId());
|
||||||
|
@ -50,7 +50,7 @@
|
|||||||
public class CommandClaimName extends BaseCommand {
|
public class CommandClaimName extends BaseCommand {
|
||||||
|
|
||||||
@CommandAlias("claimname")
|
@CommandAlias("claimname")
|
||||||
@Syntax("<name>")
|
@Syntax("<name>|clear")
|
||||||
@Description("Sets the name of your claim.")
|
@Description("Sets the name of your claim.")
|
||||||
@Subcommand("claim name")
|
@Subcommand("claim name")
|
||||||
public void execute(Player player, String 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, '&');
|
final TextComponent text = LegacyComponentSerializer.legacy().deserialize(name, '&');
|
||||||
if (text == TextComponent.empty()) {
|
if (text == TextComponent.empty() || text.content().equals("clear")) {
|
||||||
claim.getInternalClaimData().setName(null);
|
claim.getInternalClaimData().setName(null);
|
||||||
} else {
|
} else {
|
||||||
claim.getInternalClaimData().setName(text);
|
claim.getInternalClaimData().setName(text);
|
||||||
|
Loading…
Reference in New Issue
Block a user