JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PC-778

Browse Source
This commit is contained in:
samczsun 2017-03-11 01:01:44 -05:00 committed by cnr
parent 4ad5cede14
commit c95fea066c
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Inferno.java
View File

@ -69,7 +69,7 @@ public class Inferno extends SkillActive
} }
@Override @Override
public void Skill(Player player, int level) public void Skill(Player player, int level)
{ {
_active.add(player); _active.add(player);
} }

11
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/modes/ChampionsGladiators.java
View File

@ -5,6 +5,8 @@ import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityRegainHealthEvent; import org.bukkit.event.entity.EntityRegainHealthEvent;
import mineplex.minecraft.game.classcombat.Skill.event.SkillTriggerEvent;
import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.GameType; import nautilus.game.arcade.GameType;
import nautilus.game.arcade.events.GameStateChangeEvent; import nautilus.game.arcade.events.GameStateChangeEvent;
@ -17,6 +19,7 @@ import nautilus.game.arcade.game.games.champions.kits.KitRanger;
import nautilus.game.arcade.game.games.gladiators.Arena; import nautilus.game.arcade.game.games.gladiators.Arena;
import nautilus.game.arcade.game.games.gladiators.ArenaType; import nautilus.game.arcade.game.games.gladiators.ArenaType;
import nautilus.game.arcade.game.games.gladiators.Gladiators; import nautilus.game.arcade.game.games.gladiators.Gladiators;
import nautilus.game.arcade.game.games.gladiators.RoundState;
import nautilus.game.arcade.kit.Kit; import nautilus.game.arcade.kit.Kit;
/** /**
@ -88,5 +91,11 @@ public class ChampionsGladiators extends Gladiators
{ {
return "Champions Gladiators"; return "Champions Gladiators";
} }
@EventHandler
public void skill(SkillTriggerEvent event)
{
if (getRoundState() != RoundState.FIGHTING)
event.SetCancelled(true);
}
} }