Fixed a Few Things

src/main/java/com/massivecraft/factions/shop/ShopGUIFrame.java

@@ -3,7 +3,6 @@ package com.massivecraft.factions.shop;
 import com.github.stefvanschie.inventoryframework.Gui;
 import com.github.stefvanschie.inventoryframework.GuiItem;
 import com.github.stefvanschie.inventoryframework.pane.PaginatedPane;
-import com.google.common.collect.ImmutableList;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.FPlayers;
 import com.massivecraft.factions.Faction;
@@ -21,7 +20,6 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 

src/main/java/com/massivecraft/factions/util/InventoryTypeAdapter.java

@@ -1,6 +1,8 @@
 package com.massivecraft.factions.util;
 
 import com.google.gson.*;
+import com.massivecraft.factions.Conf;
+import com.massivecraft.factions.FactionsPlugin;
 import org.bukkit.inventory.Inventory;
 
 import java.lang.reflect.Type;
@@ -20,8 +22,6 @@ public class InventoryTypeAdapter implements JsonSerializer<Inventory>, JsonDese
     @Override
     public Inventory deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) {
         JsonObject object = jsonElement.getAsJsonObject();
-        return InventoryUtil.fromBase64(object.get("contents").getAsString());
+        return InventoryUtil.fromBase64(object.get("contents").getAsString(), FactionsPlugin.getInstance().color(FactionsPlugin.getInstance().getConfig().getString("fchest.Inventory-Title")));
     }
-
-
 }

src/main/java/com/massivecraft/factions/util/InventoryUtil.java

@@ -1,5 +1,6 @@
 package com.massivecraft.factions.util;
 
+import com.massivecraft.factions.FactionsPlugin;
 import org.bukkit.Bukkit;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
@@ -71,11 +72,11 @@ public class InventoryUtil {
         return toBase64(inventory);
     }
 
-    public static Inventory fromBase64(String data) {
+    public static Inventory fromBase64(String data, String invName) {
         try {
             ByteArrayInputStream inputStream = new ByteArrayInputStream(Base64Coder.decodeLines(data));
             BukkitObjectInputStream dataInput = new BukkitObjectInputStream(inputStream);
-            Inventory inventory = Bukkit.getServer().createInventory(null, dataInput.readInt());
+            Inventory inventory = Bukkit.getServer().createInventory(null, dataInput.readInt(), FactionsPlugin.getInstance().color(invName));
 
             // Read the serialized inventory
             for (int i = 0; i < inventory.getSize(); i++) {

src/main/java/com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.java

@@ -8,6 +8,7 @@ import com.massivecraft.factions.util.XMaterial;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
+import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -272,7 +273,7 @@ public class FUpgradesGUI implements Listener {
     private void updateChests(Faction faction) {
         String invName = FactionsPlugin.getInstance().color(FactionsPlugin.getInstance().getConfig().getString("fchest.Inventory-Title"));
 
-        for (Player player : faction.getOnlinePlayers()) {
+        for (HumanEntity player : faction.getChestInventory().getViewers()) {
             if (player.getInventory().getTitle() != null && player.getInventory().getTitle().equalsIgnoreCase(invName))
                 player.closeInventory();
         }

src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java

@@ -423,8 +423,14 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator {
 
     @Override
     public Inventory getChestInventory() {
-        if (chest != null) return chest;
+        if (chest == null) {
+            this.chest = Bukkit.createInventory(null, getChestSize(), FactionsPlugin.getInstance().color(FactionsPlugin.getInstance().getConfig().getString("fchest.Inventory-Title")));
+            return chest;
+        }
+        return chest;
+    }
 
+    private int getChestSize() {
         int size = 9;
         switch (getUpgrade(UpgradeType.CHEST)) {
             case 1:
@@ -437,8 +443,7 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator {
                 size = FactionsPlugin.getInstance().getConfig().getInt("fupgrades.MainMenu.Chest.Chest-Size.level-3") * 9;
                 break;
         }
-        chest = Bukkit.createInventory(null, size, FactionsPlugin.getInstance().color(FactionsPlugin.getInstance().getConfig().getString("fchest.Inventory-Title")));
+        return size;
-        return chest;
     }