diff --git a/src/main/java/com/massivecraft/factions/P.java b/src/main/java/com/massivecraft/factions/P.java index ecacaef8..2bff7467 100644 --- a/src/main/java/com/massivecraft/factions/P.java +++ b/src/main/java/com/massivecraft/factions/P.java @@ -85,6 +85,7 @@ public class P extends MPlugin { private Listener[] eventsListener; public static Economy econ = null; + public P() { p = this; } diff --git a/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java b/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java index 5b033781..2dd8c404 100644 --- a/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java +++ b/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java @@ -4,9 +4,9 @@ import com.massivecraft.factions.Conf; import com.massivecraft.factions.P; import com.massivecraft.factions.cmd.alts.CmdAlts; import com.massivecraft.factions.cmd.chest.CmdChest; -import com.massivecraft.factions.cmd.chest.CmdChestLogs; import com.massivecraft.factions.cmd.claim.*; import com.massivecraft.factions.cmd.econ.CmdMoney; +import com.massivecraft.factions.cmd.grace.CmdGrace; import com.massivecraft.factions.cmd.logout.CmdLogout; import com.massivecraft.factions.cmd.points.CmdPoints; import com.massivecraft.factions.cmd.relational.CmdRelationAlly; @@ -135,7 +135,7 @@ public class FCmdRoot extends FCommand { public CmdNotifications cmdNotifications = new CmdNotifications(); public CmdShop cmdShop = new CmdShop(); public CmdMissions cmdMissions = new CmdMissions(); - public CmdChestLogs cmdChestLogs = new CmdChestLogs(); + public FCmdRoot() { super(); @@ -248,7 +248,6 @@ public class FCmdRoot extends FCommand { this.addSubCommand(this.cmdLowPower); this.addSubCommand(this.cmdTntFill); this.addSubCommand(this.cmdChest); - this.addSubCommand(this.cmdChestLogs); this.addSubCommand(this.cmdSetBanner); this.addSubCommand(this.cmdStrikeSet); this.addSubCommand(this.cmdSpam); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdGrace.java b/src/main/java/com/massivecraft/factions/cmd/grace/CmdGrace.java similarity index 92% rename from src/main/java/com/massivecraft/factions/cmd/CmdGrace.java rename to src/main/java/com/massivecraft/factions/cmd/grace/CmdGrace.java index ab340b9a..a50fb866 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdGrace.java +++ b/src/main/java/com/massivecraft/factions/cmd/grace/CmdGrace.java @@ -1,7 +1,8 @@ -package com.massivecraft.factions.cmd; +package com.massivecraft.factions.cmd.grace; import com.massivecraft.factions.Conf; import com.massivecraft.factions.P; +import com.massivecraft.factions.cmd.FCommand; import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.zcore.util.TL; 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 320f19a6..3feeff11 100644 --- a/src/main/java/com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.java +++ b/src/main/java/com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.java @@ -21,7 +21,7 @@ import java.util.List; public class FUpgradesGUI implements Listener { public void openMainMenu(FPlayer fme) { - Inventory inventory = Bukkit.createInventory(null, 45, P.p.color(P.p.getConfig().getString("fupgrades.MainMenu.Title").replace("{faction}", fme.getFaction().getTag()))); + Inventory inventory = Bukkit.createInventory(null, P.p.getConfig().getInt("fupgrades.MainMenu.DummyItem.rows") * 9, P.p.color(P.p.getConfig().getString("fupgrades.MainMenu.Title").replace("{faction}", fme.getFaction().getTag()))); List dummySlots = P.p.getConfig().getIntegerList("fupgrades.MainMenu.DummyItem.slots"); Material dummyMaterial = Material.getMaterial(P.p.getConfig().getString("fupgrades.MainMenu.DummyItem.Type")); int dummyAmount = P.p.getConfig().getInt("fupgrades.MainMenu.DummyItem.Amount");