From 52488d95a9a5ca7c4f712a5fba7d59bd4b315451 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 31 Jul 2018 19:36:32 +0100 Subject: [PATCH] Remove gold manager as a dependanacy to prevent an NPE --- .../src/mineplex/game/clans/clans/ClansManager.java | 2 +- .../mineplex/game/clans/clans/loot/LootManager.java | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java index 596ae9a1c..aae5a1588 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java @@ -309,7 +309,7 @@ public class ClansManager extends MiniClientPlugin implements IRelat _blacklist = new ClansBlacklist(plugin); _gearManager = gearManager; - _lootManager = new LootManager(gearManager, _goldManager); + _lootManager = new LootManager(gearManager); _disguiseManager = Managers.get(DisguiseManager.class); _npcManager = new NpcManager(plugin, Managers.get(Creature.class)); _condition = new SkillConditionManager(plugin); diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/LootManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/LootManager.java index d00c19d18..3e13ec0ca 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/LootManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/LootManager.java @@ -10,14 +10,12 @@ import org.bukkit.inventory.ItemStack; import mineplex.core.common.weight.WeightSet; import mineplex.game.clans.clans.mounts.Mount.MountType; -import mineplex.game.clans.economy.GoldManager; import mineplex.game.clans.items.GearManager; public class LootManager { private final GearManager _gearManager; - private final GoldManager _goldManager; - + private WeightSet _commonSet; private WeightSet _rareSet; private WeightSet _bossSet; @@ -25,11 +23,10 @@ public class LootManager private WeightSet _raidSet; private WeightSet _capturePointSet; - public LootManager(GearManager gearManager, GoldManager goldManager) + public LootManager(GearManager gearManager) { _gearManager = gearManager; - _goldManager = goldManager; - + _commonSet = new WeightSet<>(); _rareSet = new WeightSet<>(); _bossSet = new WeightSet<>(); @@ -165,7 +162,6 @@ public class LootManager _undeadCitySet.add(1, new GearLoot(_gearManager)); // Gold - _undeadCitySet.add(5, new GoldLoot(_goldManager, 100, 1000)); _undeadCitySet.add(1, new GoldTokenLoot(5000, 10000)); }