From 88f3cbb97c0838f77b446e022fe3de82852327cf Mon Sep 17 00:00:00 2001 From: Driftay Date: Tue, 3 Sep 2019 07:16:51 -0400 Subject: [PATCH] Made Shop Load on F Reload --- src/main/java/com/massivecraft/factions/cmd/CmdReload.java | 2 ++ .../massivecraft/factions/listeners/FactionsBlockListener.java | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdReload.java b/src/main/java/com/massivecraft/factions/cmd/CmdReload.java index f67ceea4..4ba583c9 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdReload.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdReload.java @@ -2,6 +2,7 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.Conf; import com.massivecraft.factions.P; +import com.massivecraft.factions.shop.ShopConfig; import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.zcore.util.TL; @@ -28,6 +29,7 @@ public class CmdReload extends FCommand { Conf.save(); P.p.reloadConfig(); P.p.loadLang(); + ShopConfig.loadShop(); if (P.p.getConfig().getBoolean("enable-faction-flight")) { diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java index e0c3eb57..7d87b692 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java @@ -306,7 +306,6 @@ public class FactionsBlockListener implements Listener { if (event.getBlocks().isEmpty()) { return; } - Location targetLoc = event.getBlocks().get(0).getLocation(); Faction otherFaction = Board.getInstance().getFactionAt(new FLocation(targetLoc));