diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Condition/SkillConditionEffect.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Condition/SkillConditionEffect.java index 732ffb15a..b5dcbc455 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Condition/SkillConditionEffect.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Condition/SkillConditionEffect.java @@ -1,8 +1,11 @@ package mineplex.minecraft.game.classcombat.Condition; +import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; +import mineplex.core.common.util.UtilServer; +import mineplex.core.updater.event.UpdateEvent; import mineplex.minecraft.game.core.condition.ConditionEffect; import mineplex.minecraft.game.core.condition.ConditionManager; import mineplex.minecraft.game.classcombat.Skill.event.SkillTriggerEvent; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java index 25a4d66cc..c365cbf4b 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java @@ -231,16 +231,19 @@ public class ArcadeManager extends MiniPlugin implements IRelation _explosionManager = new Explosion(plugin, _blockRestore); _explosionManager.SetDebris(false); - if (serverConfig.GameList.contains(GameType.ChampionsDominate) - || serverConfig.GameList.contains(GameType.ChampionsTDM) - || serverConfig.GameList.contains(GameType.ChampionsCTF)) - { - _conditionManager = new SkillConditionManager(plugin); - } - else - { - _conditionManager = new ConditionManager(plugin); - } + _conditionManager = new SkillConditionManager(plugin); + + //Dont see a reason to ever just use the normal one +// if (serverConfig.GameList.contains(GameType.ChampionsDominate) +// || serverConfig.GameList.contains(GameType.ChampionsTDM) +// || serverConfig.GameList.contains(GameType.ChampionsCTF)) +// { +// _conditionManager = new SkillConditionManager(plugin); +// } +// else +// { +// _conditionManager = new ConditionManager(plugin); +// } _clientManager = clientManager; _serverStatusManager = serverStatusManager;