From ad56264c5d8c01176d4924e23665e4b97e18dd7d Mon Sep 17 00:00:00 2001 From: Driftay Date: Sun, 26 Jan 2020 15:54:54 -0500 Subject: [PATCH] 1.15 Support for Permissable Items & Fixed F Upgrades GUI Rows --- .../massivecraft/factions/listeners/FactionsPlayerListener.java | 2 +- .../massivecraft/factions/zcore/fupgrades/FUpgradeFrame.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java index a4833956..660326e3 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java @@ -338,7 +338,7 @@ public class FactionsPlayerListener implements Listener { return PermissableAction.DOOR; if (material.name().toUpperCase().contains("BUTTON") || material.name().toUpperCase().contains("PRESSURE") || material.name().contains("DIODE") || material.name().contains("COMPARATOR")) return PermissableAction.BUTTON; - if (FactionsPlugin.instance.mc113 || FactionsPlugin.instance.mc114) { + if (FactionsPlugin.instance.mc113 || FactionsPlugin.instance.mc114 || FactionsPlugin.getInstance().mc115) { switch (material) { case LEVER: return PermissableAction.LEVER; diff --git a/src/main/java/com/massivecraft/factions/zcore/fupgrades/FUpgradeFrame.java b/src/main/java/com/massivecraft/factions/zcore/fupgrades/FUpgradeFrame.java index e3d17197..3685c2ef 100644 --- a/src/main/java/com/massivecraft/factions/zcore/fupgrades/FUpgradeFrame.java +++ b/src/main/java/com/massivecraft/factions/zcore/fupgrades/FUpgradeFrame.java @@ -25,7 +25,7 @@ public class FUpgradeFrame { public FUpgradeFrame(Faction f) { this.gui = new Gui(FactionsPlugin.getInstance(), - FactionsPlugin.getInstance().getConfig().getInt("fupgrades.MainMenu.rows", 5), + FactionsPlugin.getInstance().getConfig().getInt("fupgrades.MainMenu.Rows", 5), FactionsPlugin.getInstance().getConfig().getString("fupgrades.MainMenu.Title").replace("{faction}", f.getTag())); }