From 139a28de8a316ef8a832de04d2869d3f023524a9 Mon Sep 17 00:00:00 2001 From: Joshua Murphy Date: Tue, 20 Nov 2018 07:37:45 -0500 Subject: [PATCH] Multiple Typos/Fixes From https://github.com/ProSavage/SavageFactions/issues --- .../massivecraft/factions/cmd/CmdChest.java | 1 + .../listeners/FactionsPlayerListener.java | 2 +- src/main/resources/config.yml | 27 ++++++++++--------- src/main/resources/plugin.yml | 2 +- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdChest.java b/src/main/java/com/massivecraft/factions/cmd/CmdChest.java index aeb22468..388c29a8 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdChest.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdChest.java @@ -11,6 +11,7 @@ public class CmdChest extends FCommand { public CmdChest() { this.aliases.add("chest"); + this.aliases.add("pv"); //this.requiredArgs.add(""); diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java index 3137b33d..0d9eea91 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java @@ -435,7 +435,7 @@ public class FactionsPlayerListener implements Listener { if (SavageFactions.plugin.getConfig().getBoolean("scoreboard.default-enabled", false)) { FScoreboard.init(me); - FScoreboard.get(me).setDefaultSidebar(new FDefaultSidebar(), SavageFactions.plugin.getConfig().getInt("default-update-interval", 20)); + FScoreboard.get(me).setDefaultSidebar(new FDefaultSidebar(), SavageFactions.plugin.getConfig().getInt("scoreboard.default-update-interval", 20)); FScoreboard.get(me).setSidebarVisibility(me.showScoreboard()); } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 222f8662..80ddaa6f 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,8 +1,9 @@ # SavageFactions by ProSavage -# Report issues https://github.com/ProSavage/SavageFactions/issues/new -# Live support https://discord.gg/W9dv9WP -# Spigot Site: https://www.spigotmc.org/resources/savagefactions-factionsuuid-reimagined-1-7-1-12.52891/ +# Report issues: https://github.com/ProSavage/SavageFactions/issues/new +# Live support: https://discord.gg/W9dv9WP +# Spigot Site: https://www.spigotmc.org/resources/savagefactions-factionsuuid-reimagined-1-7-1-12.52891/ # Website: https://www.prosavage.net/ +# Jenkins: https://jenkins.prosavage.net/ # Made with love <3 @@ -70,12 +71,6 @@ ffly: Enable-While-Vanished: true AutoEnable: true #If set to true, fly will automatically enable when walking into your own chunk. - - -# This will set the timeout for the stealth in seconds. -stealth-timeout: 300 -stealth-cost: 500 - # If a player leaves fly (out of territory or took damage) # how long should they not take fall damage for? # Set to 0 to have them always take fall damage. @@ -355,7 +350,7 @@ help: - '&e/f list &8- &7List all factions.' - '&e/f top &8- &7View the richest factions.' - '&e/f map &8- &7Map of the surrounding area, click chunks to claim.' - - '&e/f sethome &8- &7Teleport to faction home.' + - '&e/f sethome &8- &7Set your faction home.' - '&e/f home &8- &7Set your faction home.' - '&e/f title &f &8- &7Set a player''s title, color codes supported.' - '&e/f ban &8- &7Ban a member from your faction.' @@ -734,7 +729,7 @@ checkpoints: ############################################################ # +------------------------------------------------------+ # -# | Faction Near | # +# | Faction Near | # # +------------------------------------------------------+ # ############################################################ fnear: @@ -761,12 +756,13 @@ fvault: ############################################################ # +------------------------------------------------------+ # -# | Faction Vault | # +# | Faction Chest | # # +------------------------------------------------------+ # fchest: Enabled: true Inventory-Title: '&2&lFaction Chest' - # Vault size upgrades can be configured in the upgrades section of config + # Chest size upgrades can be configured in the upgrades section of config + ############################################################ # +------------------------------------------------------+ # # | Faction Upgrades | # @@ -940,6 +936,11 @@ fupgrades: slots: - 22 +############################################################ +# +------------------------------------------------------+ # +# | Faction Banners | # +# +------------------------------------------------------+ # +############################################################ fbanners: Enabled: true Item: diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 6958982e..37752b54 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -2,7 +2,7 @@ name: Factions version: ${project.version}-1.4-STABLE api-version: 1.13 main: com.massivecraft.factions.SavageFactions -authors: [Olof Larsson, Brett Flannigan, drtshock, ProSavage, AL56AF50] +authors: [Olof Larsson, Brett Flannigan, drtshock, ProSavage, AL56AF50, Driftay] softdepend: [CoreProtect, PlayerVaults, PlaceholderAPI, MVdWPlaceholderAPI, PermissionsEx, Permissions, Essentials, EssentialsChat, HeroChat, iChat, LocalAreaChat, LWC, nChat, ChatManager, CAPI, AuthMe, Vault, Spout, WorldEdit, WorldGuard, AuthDB, CaptureThePoints, CombatTag, dynmap, FactionsTop] website: www.prosavage.net commands: