From f5d26ac18255fffaa0ad4daeedb234b93ddb780b Mon Sep 17 00:00:00 2001 From: hyper Date: Mon, 17 Apr 2023 17:45:43 -0400 Subject: [PATCH 1/4] Adds the "remove_essentials_home" mechanism Adds the "remove_essentials_home" mechanism. --- .../essentials/EssentialsPlayerProperties.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/properties/essentials/EssentialsPlayerProperties.java b/src/main/java/com/denizenscript/depenizen/bukkit/properties/essentials/EssentialsPlayerProperties.java index b309b8e5b..d9c72b6e5 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/properties/essentials/EssentialsPlayerProperties.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/properties/essentials/EssentialsPlayerProperties.java @@ -50,7 +50,7 @@ public static EssentialsPlayerProperties getFrom(ObjectTag object) { }; public static final String[] handledMechs = new String[] { - "is_afk", "god_mode", "is_muted", "socialspy", "vanish", "essentials_ignore" + "is_afk", "god_mode", "is_muted", "socialspy", "vanish", "essentials_ignore", "remove_essentials_home" }; public EssentialsPlayerProperties(PlayerTag player) { @@ -301,6 +301,22 @@ public void adjust(Mechanism mechanism) { } } + // <--[mechanism] + // @object PlayerTag + // @name remove_essentials_home + // @input ElementTag(String) + // @plugin Depenizen, Essentials + // @description + // Removes the specified player's Essentials home. + // --> + if (mechanism.matches("remove_essentials_home")) { + try { + getUser().delHome(mechanism.getValue().toString()); + } catch (Exception e) { + Debug.echoError(e); + } + } + // <--[mechanism] // @object PlayerTag // @name socialspy From 9809c5608ae534a39d0b5ba6cb4756fb241a4a8d Mon Sep 17 00:00:00 2001 From: hyper Date: Wed, 19 Apr 2023 17:04:26 -0400 Subject: [PATCH 2/4] Update EssentialsPlayerProperties.java --- .../essentials/EssentialsPlayerProperties.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/properties/essentials/EssentialsPlayerProperties.java b/src/main/java/com/denizenscript/depenizen/bukkit/properties/essentials/EssentialsPlayerProperties.java index d9c72b6e5..4999ffc8d 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/properties/essentials/EssentialsPlayerProperties.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/properties/essentials/EssentialsPlayerProperties.java @@ -304,16 +304,17 @@ public void adjust(Mechanism mechanism) { // <--[mechanism] // @object PlayerTag // @name remove_essentials_home - // @input ElementTag(String) + // @input ElementTag // @plugin Depenizen, Essentials // @description - // Removes the specified player's Essentials home. + // Removes the player's Essentials home that matches the specified name. // --> if (mechanism.matches("remove_essentials_home")) { try { getUser().delHome(mechanism.getValue().toString()); - } catch (Exception e) { - Debug.echoError(e); + } + catch (Exception e) { + Debug.echoError("Invalid home name specified!"); } } From 9b321c48dd84a7c14b9fda0755e79dc8047708c3 Mon Sep 17 00:00:00 2001 From: hyper Date: Fri, 21 Apr 2023 18:52:43 -0400 Subject: [PATCH 3/4] Update EssentialsPlayerProperties.java --- .../properties/essentials/EssentialsPlayerProperties.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/properties/essentials/EssentialsPlayerProperties.java b/src/main/java/com/denizenscript/depenizen/bukkit/properties/essentials/EssentialsPlayerProperties.java index 4999ffc8d..d8439637b 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/properties/essentials/EssentialsPlayerProperties.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/properties/essentials/EssentialsPlayerProperties.java @@ -314,7 +314,7 @@ public void adjust(Mechanism mechanism) { getUser().delHome(mechanism.getValue().toString()); } catch (Exception e) { - Debug.echoError("Invalid home name specified!"); + mechanism.echoError("Invalid home name specified!"); } } From cfa2a54982186405570b18ca3aa8dac1fe9373a6 Mon Sep 17 00:00:00 2001 From: hyper Date: Sun, 23 Apr 2023 20:07:17 -0400 Subject: [PATCH 4/4] Update EssentialsPlayerProperties.java --- .../essentials/EssentialsPlayerProperties.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/properties/essentials/EssentialsPlayerProperties.java b/src/main/java/com/denizenscript/depenizen/bukkit/properties/essentials/EssentialsPlayerProperties.java index d8439637b..52c6a0703 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/properties/essentials/EssentialsPlayerProperties.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/properties/essentials/EssentialsPlayerProperties.java @@ -311,10 +311,15 @@ public void adjust(Mechanism mechanism) { // --> if (mechanism.matches("remove_essentials_home")) { try { - getUser().delHome(mechanism.getValue().toString()); + if (getUser().hasHome(mechanism.getValue().toString())) { + getUser().delHome(mechanism.getValue().toString()); + } + else { + mechanism.echoError("Invalid home name specified!"); + } } catch (Exception e) { - mechanism.echoError("Invalid home name specified!"); + Debug.echoError(e); } }