Upstream/GriefDefender
1
0
Fork 0
mirror of https://github.com/bloodmc/GriefDefender.git synced 2024-06-22 09:44:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add support to clear claim names. Fixes #158

Browse Source
This commit is contained in:
bloodshot 2020-04-09 17:59:46 -04:00
parent d043037d26
commit 6f96c90d9d
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bukkit/src/main/java/com/griefdefender/command/CommandClaimFarewell.java
View File

@ -50,7 +50,7 @@ public class CommandClaimFarewell extends BaseCommand {
@CommandAlias("claimfarewell")
@Description("Sets the farewell message of your claim.")
@Syntax("<message>")
@Syntax("<message>|clear")
@Subcommand("claim farewell")
public void execute(Player player, String message) {
final GDPlayerData playerData = GriefDefenderPlugin.getInstance().dataStore.getOrCreatePlayerData(player.getWorld(), player.getUniqueId());

2
bukkit/src/main/java/com/griefdefender/command/CommandClaimGreeting.java
View File

@ -50,7 +50,7 @@ public class CommandClaimGreeting extends BaseCommand {
@CommandAlias("claimgreeting")
@Description("Sets the greeting message of your claim.")
@Syntax("<message>")
@Syntax("<message>|clear")
@Subcommand("claim greeting")
public void execute(Player player, String message) {
final GDPlayerData playerData = GriefDefenderPlugin.getInstance().dataStore.getOrCreatePlayerData(player.getWorld(), player.getUniqueId());

6
bukkit/src/main/java/com/griefdefender/command/CommandClaimName.java
View File

@ -52,7 +52,7 @@
public class CommandClaimName extends BaseCommand {
@CommandAlias("claimname")
@Syntax("<name>")
@Syntax("<name>|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);

2
sponge/src/main/java/com/griefdefender/command/CommandClaimFarewell.java
View File

@ -49,7 +49,7 @@ public class CommandClaimFarewell extends BaseCommand {
@CommandAlias("claimfarewell")
@Description("Sets the farewell message of your claim.")
@Syntax("<message>")
@Syntax("<message>|clear")
@Subcommand("claim farewell")
public void execute(Player player, String message) {
final GDPlayerData playerData = GriefDefenderPlugin.getInstance().dataStore.getOrCreatePlayerData(player.getWorld(), player.getUniqueId());

2
sponge/src/main/java/com/griefdefender/command/CommandClaimGreeting.java
View File

@ -49,7 +49,7 @@ public class CommandClaimGreeting extends BaseCommand {
@CommandAlias("claimgreeting")
@Description("Sets the greeting message of your claim.")
@Syntax("<message>")
@Syntax("<message>|clear")
@Subcommand("claim greeting")
public void execute(Player player, String message) {
final GDPlayerData playerData = GriefDefenderPlugin.getInstance().dataStore.getOrCreatePlayerData(player.getWorld(), player.getUniqueId());

6
sponge/src/main/java/com/griefdefender/command/CommandClaimName.java
View File

@ -50,7 +50,7 @@
public class CommandClaimName extends BaseCommand {
@CommandAlias("claimname")
@Syntax("<name>")
@Syntax("<name>|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);