From 56b200fb9b01c9cdd717b20950ab5a11a37d86bc Mon Sep 17 00:00:00 2001 From: Driftay Date: Fri, 19 Jul 2019 18:53:42 -0400 Subject: [PATCH 1/2] Home Perm Fixed ! --- .../java/com/massivecraft/factions/Conf.java | 2 +- .../massivecraft/factions/SaberFactions.java | 4 --- .../zcore/fperms/DefaultPermissions.java | 2 +- .../zcore/fperms/PermissableAction.java | 31 +++++++++---------- .../factions/zcore/util/Persist.java | 2 +- 5 files changed, 18 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/Conf.java b/src/main/java/com/massivecraft/factions/Conf.java index 31c85584..8def02dd 100644 --- a/src/main/java/com/massivecraft/factions/Conf.java +++ b/src/main/java/com/massivecraft/factions/Conf.java @@ -405,7 +405,7 @@ public class Conf { defaultFactionPermissions.put("LEADER", new DefaultPermissions(true)); defaultFactionPermissions.put("COLEADER", new DefaultPermissions(true)); defaultFactionPermissions.put("MODERATOR", new DefaultPermissions(true)); - defaultFactionPermissions.put("MEMBER", new DefaultPermissions(false)); + defaultFactionPermissions.put("NORMAL MEMBER", new DefaultPermissions(false)); defaultFactionPermissions.put("RECRUIT", new DefaultPermissions(false)); } diff --git a/src/main/java/com/massivecraft/factions/SaberFactions.java b/src/main/java/com/massivecraft/factions/SaberFactions.java index e8e2b839..b3db0cf1 100644 --- a/src/main/java/com/massivecraft/factions/SaberFactions.java +++ b/src/main/java/com/massivecraft/factions/SaberFactions.java @@ -479,10 +479,6 @@ public class SaberFactions extends MPlugin { MCommand commandEx = cmdBase; List> commandsList = cmdBase.subCommands; - if (Board.getInstance().getFactionAt(new FLocation(fPlayer.getPlayer().getLocation())).isWarZone()) { - return new ArrayList<>(); - } - for (; !commandsList.isEmpty() && !argsList.isEmpty(); argsList.remove(0)) { String cmdName = argsList.get(0).toLowerCase(); MCommand commandFounded = commandsList.stream() diff --git a/src/main/java/com/massivecraft/factions/zcore/fperms/DefaultPermissions.java b/src/main/java/com/massivecraft/factions/zcore/fperms/DefaultPermissions.java index 98e242d2..74748b4e 100644 --- a/src/main/java/com/massivecraft/factions/zcore/fperms/DefaultPermissions.java +++ b/src/main/java/com/massivecraft/factions/zcore/fperms/DefaultPermissions.java @@ -135,7 +135,7 @@ public class DefaultPermissions { else if (name == "sethome") return this.sethome; else if (name == "territory") return this.territory; else if (name == "access") return this.access; - else if (name == "home") return this.disband; + else if (name == "home") return this.home; else if (name == "disband") return this.disband; else if (name == "promote") return this.promote; else if (name == "setwarp") return this.setwarp; diff --git a/src/main/java/com/massivecraft/factions/zcore/fperms/PermissableAction.java b/src/main/java/com/massivecraft/factions/zcore/fperms/PermissableAction.java index 490d559b..4646f7b8 100644 --- a/src/main/java/com/massivecraft/factions/zcore/fperms/PermissableAction.java +++ b/src/main/java/com/massivecraft/factions/zcore/fperms/PermissableAction.java @@ -102,15 +102,13 @@ public enum PermissableAction { String displayName = replacePlaceholders(section.getString("placeholder-item.name"), fme, permissable); List lore = new ArrayList<>(); - if (section.getString("materials." + name().toLowerCase().replace('_', '-')) == null) { - return null; - } + if (section.getString("materials." + name().toLowerCase().replace('_', '-')) == null) return null; + Material material = XMaterial.matchXMaterial(section.getString("materials." + name().toLowerCase().replace('_', '-'))).parseMaterial(); Access access = fme.getFaction().getAccess(permissable, this); - if (access == null) { - access = Access.UNDEFINED; - } + if (access == null) access = Access.UNDEFINED; + ItemStack item = new ItemStack(material); ItemMeta itemMeta = item.getItemMeta(); @@ -129,29 +127,30 @@ public enum PermissableAction { } // If under the 1.13 version we will use the colorable option. - if (!SaberFactions.plugin.mc113) { + if (!SaberFactions.plugin.mc113 && !SaberFactions.plugin.mc114) { //TODO see if it's working in other version than 1.13 and 1.14 DyeColor dyeColor = null; try { dyeColor = DyeColor.valueOf(section.getString("access." + access.name().toLowerCase())); } catch (Exception exception) { } + accessValue = "deny"; if (dyeColor != null) { item.setDurability(dyeColor.getWoolData()); } } else { - // so this is in 1.13 mode, our config will automatically be updated to a material instead of color because of it being removed in the new api - item.setType(XMaterial.matchXMaterial(SaberFactions.plugin.getConfig().getString("fperm-gui.action.access.") + accessValue).parseMaterial()); + Material mat = XMaterial.CYAN_GLAZED_TERRACOTTA.parseMaterial(); + switch (accessValue) { + case "deny": mat = XMaterial.RED_GLAZED_TERRACOTTA.parseMaterial(); break; + case "allow": mat = XMaterial.GREEN_GLAZED_TERRACOTTA.parseMaterial(); break; + case "undefined": mat = XMaterial.CYAN_GLAZED_TERRACOTTA.parseMaterial(); break; + } + item.setType(mat); } - for (String loreLine : section.getStringList("placeholder-item.lore")) { - lore.add(replacePlaceholders(loreLine, fme, permissable)); - } - - if (!SaberFactions.plugin.mc17) { - itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES); - } + for (String loreLine : section.getStringList("placeholder-item.lore")) lore.add(replacePlaceholders(loreLine, fme, permissable)); + if (!SaberFactions.plugin.mc17) itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES); itemMeta.setDisplayName(displayName); itemMeta.setLore(lore); diff --git a/src/main/java/com/massivecraft/factions/zcore/util/Persist.java b/src/main/java/com/massivecraft/factions/zcore/util/Persist.java index 21d3027a..d7f038d0 100644 --- a/src/main/java/com/massivecraft/factions/zcore/util/Persist.java +++ b/src/main/java/com/massivecraft/factions/zcore/util/Persist.java @@ -100,7 +100,7 @@ public class Persist { } public boolean save(Object instance, File file) { - return DiscUtil.writeCatch(file, p.gson.toJson(instance), true); + return DiscUtil.writeCatch(file, p.gson.toJson(instance), false); } // LOAD BY CLASS From 5b338a25d69cb375cbf99cb0a26c34cafdb5e511 Mon Sep 17 00:00:00 2001 From: Driftay Date: Fri, 19 Jul 2019 18:55:11 -0400 Subject: [PATCH 2/2] Home Perm Fixed ! --- .../massivecraft/factions/zcore/fperms/DefaultPermissions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/massivecraft/factions/zcore/fperms/DefaultPermissions.java b/src/main/java/com/massivecraft/factions/zcore/fperms/DefaultPermissions.java index 98e242d2..74748b4e 100644 --- a/src/main/java/com/massivecraft/factions/zcore/fperms/DefaultPermissions.java +++ b/src/main/java/com/massivecraft/factions/zcore/fperms/DefaultPermissions.java @@ -135,7 +135,7 @@ public class DefaultPermissions { else if (name == "sethome") return this.sethome; else if (name == "territory") return this.territory; else if (name == "access") return this.access; - else if (name == "home") return this.disband; + else if (name == "home") return this.home; else if (name == "disband") return this.disband; else if (name == "promote") return this.promote; else if (name == "setwarp") return this.setwarp;