diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilServer.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilServer.java index 0d6555bec..ed655b93a 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilServer.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilServer.java @@ -19,8 +19,6 @@ import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginManager; import org.bukkit.scheduler.BukkitRunnable; -import mineplex.core.vanish.events.PreVanishEvent; - public class UtilServer { public static Player[] getPlayers() @@ -115,7 +113,7 @@ public class UtilServer return getServer().getPluginManager(); } - public static T callEvent(T event) + public static void callEvent(T event) { getPluginManager().callEvent(event); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/vanish/Vanish.java b/Plugins/Mineplex.Core/src/mineplex/core/vanish/Vanish.java index c6f51cc64..3da4d9b0e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/vanish/Vanish.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/vanish/Vanish.java @@ -58,10 +58,7 @@ public class Vanish extends MiniClientPlugin return enabled; } - - @EventHandler - public void join - + @EventHandler(priority = EventPriority.LOWEST) public void ClientLoad(AsyncPlayerPreLoginEvent event) { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/vanish/repository/VanishRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/vanish/repository/VanishRepository.java index 1d3cf0239..cf6270297 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/vanish/repository/VanishRepository.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/vanish/repository/VanishRepository.java @@ -38,7 +38,7 @@ public class VanishRepository extends MinecraftRepository status.Set(Boolean.FALSE); }, new ColumnInt("accountId", accountId)); - return status.GetDispose().booleanValue(); + return status.Get().booleanValue(); } protected void initialize() 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 109bfccdb..705380b21 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 @@ -94,7 +94,6 @@ import mineplex.game.clans.clans.redis.ClanLoadCommandHandler; import mineplex.game.clans.clans.regions.ClansRegions; import mineplex.game.clans.clans.scoreboard.ClansScoreboardManager; import mineplex.game.clans.clans.siege.SiegeManager; -import mineplex.game.clans.clans.stuck.StuckManager; import mineplex.game.clans.clans.supplyDrop.SupplyDropManager; import mineplex.game.clans.clans.tntGenerator.TntGeneratorManager; import mineplex.game.clans.clans.war.WarManager; @@ -165,6 +164,7 @@ public class ClansManager extends MiniClientPluginimplements IRelati private LootManager _lootManager; private DonationManager _donationManager; private NetherManager _netherManager; + private DamageManager _damageManager; private Playtime _playTracker; @@ -241,9 +241,9 @@ public class ClansManager extends MiniClientPluginimplements IRelati Creature creature = new Creature(plugin); _npcManager = new NpcManager(plugin, creature); _condition = new SkillConditionManager(plugin); - DamageManager damageManager = new DamageManager(plugin, _combatManager, _npcManager, _disguiseManager, _condition); - damageManager.addCommand(new KillCommand(damageManager)); - _worldEvent = new WorldEventManager(plugin, this, damageManager, _lootManager, blockRestore, _clanRegions, null); + _damageManager = new DamageManager(plugin, _combatManager, _npcManager, _disguiseManager, _condition); + _damageManager.addCommand(new KillCommand(_damageManager)); + _worldEvent = new WorldEventManager(plugin, this, _damageManager, _lootManager, blockRestore, _clanRegions, null); TaskManager taskManager = new TaskManager(plugin, _clientManager, webServerAddress); @@ -280,23 +280,23 @@ public class ClansManager extends MiniClientPluginimplements IRelati _observerManager = new ObserverManager(plugin, _condition, this); new ClanEnergyTracker(plugin, this); - new StuckManager(this); +// new StuckManager(this); // new ClansAlphaManager(this, taskManager); new PotatoManager(plugin, this); new Weapon(plugin, energy); - new Gameplay(plugin, this, blockRestore, damageManager); + new Gameplay(plugin, this, blockRestore, _damageManager); _projectileManager = new ProjectileManager(plugin); - Fire fire = new Fire(plugin, _condition, damageManager); + Fire fire = new Fire(plugin, _condition, _damageManager); HashSet itemIgnore = new HashSet(); itemIgnore.add("Proximity Explosive"); itemIgnore.add("Proximity Zapper"); - ItemFactory itemFactory = new ItemFactory(plugin, blockRestore, _condition, damageManager, energy, fire, _projectileManager, webServerAddress, itemIgnore); - SkillFactory skillManager = new SkillFactory(plugin, damageManager, this, _combatManager, _condition, _projectileManager, _disguiseManager, blockRestore, fire, new Movement(plugin), teleport, energy, webServerAddress); + ItemFactory itemFactory = new ItemFactory(plugin, blockRestore, _condition, _damageManager, energy, fire, _projectileManager, webServerAddress, itemIgnore); + SkillFactory skillManager = new SkillFactory(plugin, _damageManager, this, _combatManager, _condition, _projectileManager, _disguiseManager, blockRestore, fire, new Movement(plugin), teleport, energy, webServerAddress); skillManager.RemoveSkill("Dwarf Toss", "Block Toss"); skillManager.removeSkill("Whirlwind Axe"); skillManager.removeSkill("Shield Smash"); @@ -1206,4 +1206,9 @@ public class ClansManager extends MiniClientPluginimplements IRelati { return player.getName().equals("NewGarbo"); } + + public DamageManager getDamageManager() + { + return _damageManager; + } }