Update to new Towny API setup, fixes #310

DenizenScript · Feb 13, 2020 · 24a97eb · 24a97eb
1 parent 94ed65c
commit 24a97eb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/lib/Towny.jar b/lib/Towny.jar
diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/objects/factions/NationTag.java b/src/main/java/com/denizenscript/depenizen/bukkit/objects/factions/NationTag.java
@@ -153,7 +153,7 @@ public String getAttribute(Attribute attribute) {
         // -->
         if (attribute.startsWith("balance")) {
             try {
-                return new ElementTag(nation.getHoldingBalance()).getAttribute(attribute.fulfill(1));
+                return new ElementTag(nation.getAccount().getHoldingBalance()).getAttribute(attribute.fulfill(1));
             }
             catch (EconomyException e) {
                 if (!attribute.hasAlternative()) {

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/objects/towny/TownTag.java b/src/main/java/com/denizenscript/depenizen/bukkit/objects/towny/TownTag.java
@@ -188,7 +188,7 @@ public String getAttribute(Attribute attribute) {
         // -->
         else if (attribute.startsWith("balance")) {
             try {
-                return new ElementTag(town.getHoldingBalance()).getAttribute(attribute.fulfill(1));
+                return new ElementTag(town.getAccount().getHoldingBalance()).getAttribute(attribute.fulfill(1));
             }
             catch (EconomyException e) {
                 if (!attribute.hasAlternative()) {

diff --git a/...n/java/com/denizenscript/depenizen/bukkit/properties/towny/TownyChatPlayerProperties.java b/...n/java/com/denizenscript/depenizen/bukkit/properties/towny/TownyChatPlayerProperties.java
@@ -81,7 +81,7 @@ public String getAttribute(Attribute attribute) {
             }
 
             // <--[tag]
-            // @attribute <PlayerTag.townychat.muted_in[<channel name>]>
+            // @attribute <PlayerTag.townychat.muted_in[<channel_name>]>
             // @returns ElementTag(Boolean)
             // @plugin Depenizen, Towny
             // @description
@@ -96,7 +96,7 @@ else if (attribute.startsWith("muted_in") && attribute.hasContext(1)) {
             }
 
             // <--[tag]
-            // @attribute <PlayerTag.townychat.has_permission[<channel name>]>
+            // @attribute <PlayerTag.townychat.has_permission[<channel_name>]>
             // @returns ElementTag(Boolean)
             // @plugin Depenizen, Towny
             // @description
@@ -108,7 +108,7 @@ else if (attribute.startsWith("has_permission") && attribute.hasContext(1)) {
                     return null;
                 }
                 String perm = c.getPermission();
-                if (perm == null || !plugin.getTowny().isPermissions()) {
+                if (perm == null) {
                     return new ElementTag(true).getAttribute(attribute.fulfill(1));
                 }
                 return new ElementTag(TownyUniverse.getPermissionSource().has(player.getPlayerEntity(), perm))