From 5d58081f78b77d7a8634583adcb22f1cd767c4ef Mon Sep 17 00:00:00 2001 From: Naman Date: Thu, 27 Dec 2018 11:53:36 -0600 Subject: [PATCH 1/4] Update README.md --- README.md | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 7fe0175e..330e5c6f 100644 --- a/README.md +++ b/README.md @@ -30,23 +30,19 @@ The video can be found [here](https://www.youtube.com/watch?v=fnDwjA2gX-E). If you would like to use the plugin as a dependency in your project, you can use maven. ```xml - - savagefactions-repo - https://cdn.jsdelivr.net/gh/ProSavage/SavageFactions@1.6.x/ - - true - - - true - - + + + jitpack.io + https://jitpack.io + + - - com.massivecraft - Factions - {version} - provided - + + com.github.ProSavage + SavageFactions + 1.6.x-0.1.21-gbdd5473-400 + provided + ``` The {version} has to be replaced with a version you find in the [mvn-repo](https://github.com/ProSavage/SavageFactions/tree/1.6.x/mvn-repo/com/massivecraft/Factions) folder. An example version that can be used is: `1.6.9.5-U0.2.1-RC-1.5-BETA` From 90582c846a7ffbf4ca12e6d8f16fb48a249899df Mon Sep 17 00:00:00 2001 From: Naman Date: Thu, 27 Dec 2018 11:54:37 -0600 Subject: [PATCH 2/4] Update README.md --- README.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 330e5c6f..bae50a67 100644 --- a/README.md +++ b/README.md @@ -30,19 +30,19 @@ The video can be found [here](https://www.youtube.com/watch?v=fnDwjA2gX-E). If you would like to use the plugin as a dependency in your project, you can use maven. ```xml - - - jitpack.io - https://jitpack.io - - + + + jitpack.io + https://jitpack.io + + - - com.github.ProSavage - SavageFactions - 1.6.x-0.1.21-gbdd5473-400 - provided - + + com.github.ProSavage + SavageFactions + 1.6.x-0.1.21-gbdd5473-400 + provided + ``` The {version} has to be replaced with a version you find in the [mvn-repo](https://github.com/ProSavage/SavageFactions/tree/1.6.x/mvn-repo/com/massivecraft/Factions) folder. An example version that can be used is: `1.6.9.5-U0.2.1-RC-1.5-BETA` From e14339444cae0b6e2020aecafc9d2f8ed92dda15 Mon Sep 17 00:00:00 2001 From: Driftay Date: Sat, 29 Dec 2018 02:50:44 -0500 Subject: [PATCH 3/4] Fixed Disband Exploit --- .../com/massivecraft/factions/cmd/CmdDisband.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdDisband.java b/src/main/java/com/massivecraft/factions/cmd/CmdDisband.java index 446a7e42..a837e1ab 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdDisband.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdDisband.java @@ -30,7 +30,7 @@ public class CmdDisband extends FCommand { this.disableOnLock = true; - senderMustBePlayer = false; + senderMustBePlayer = false; senderMustBeMember = false; senderMustBeModerator = false; senderMustBeColeader = false; @@ -46,6 +46,19 @@ public class CmdDisband extends FCommand { return; } + boolean isMyFaction = fme != null && faction == myFaction; + + if (isMyFaction) { + if (!assertMinRole(Role.LEADER)) { + return; + } + } else { + if (!Permission.DISBAND_ANY.has(sender, true)) { + return; + } + } + + if (!fme.isAdminBypassing()) { Access access = faction.getAccess(fme, PermissableAction.DISBAND); if (fme.getRole() != Role.LEADER && faction.getFPlayerLeader() != fme && access != Access.ALLOW) { From c45ee751f521f6298e431d3cbe3b0caf2475ccf9 Mon Sep 17 00:00:00 2001 From: Driftay Date: Sat, 29 Dec 2018 13:43:54 -0500 Subject: [PATCH 4/4] Fixed F Chest Name Bug --- .../massivecraft/factions/zcore/fupgrades/FUpgradesGUI.java | 1 - .../massivecraft/factions/zcore/persist/MemoryFaction.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.java b/src/main/java/com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.java index 5b78928f..4ddcc31e 100644 --- a/src/main/java/com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.java +++ b/src/main/java/com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.java @@ -168,7 +168,6 @@ public class FUpgradesGUI implements Listener { case 2: size = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Chest.Chest-Size.level-2"); break; case 3: size = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Chest.Chest-Size.level-3"); break; } - faction.setChestSize(size * 9); } diff --git a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java index d59442be..79d74630 100644 --- a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java +++ b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java @@ -375,7 +375,7 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator { size = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Chest.Chest-Size.level-3") * 9; } - chest = Bukkit.createInventory(null, size); + chest = Bukkit.createInventory(null, size, SavageFactions.plugin.color(SavageFactions.plugin.getConfig().getString("fchest.Inventory-Title"))); return chest; } @@ -385,7 +385,7 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator { @Override public void setChestSize(int chestSize) { ItemStack[] contents = this.getChestInventory().getContents(); - chest = Bukkit.createInventory(null, chestSize); + chest = Bukkit.createInventory(null, chestSize, SavageFactions.plugin.color(SavageFactions.plugin.getConfig().getString("fchest.Inventory-Title"))); chest.setContents(contents); }