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

Fixed kit bug.

Browse Source
This commit is contained in:
Mysticate 2015-08-29 10:44:11 -06:00
parent 12d9888a1f
commit 55a7ea0439
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java
View File

@ -34,6 +34,7 @@ import mineplex.minecraft.game.core.damage.CustomDamageEvent;
import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.GameType;
import nautilus.game.arcade.events.GameStateChangeEvent;
import nautilus.game.arcade.events.PlayerPrepareTeleportEvent;
import nautilus.game.arcade.game.GameTeam;
import nautilus.game.arcade.game.SoloGame;
import nautilus.game.arcade.game.games.evolution.events.EvolutionAbilityUseEvent;
@ -213,21 +214,30 @@ public class Evolution extends SoloGame
return viewing;
}
//Double Kit
//Double kit
@EventHandler(priority = EventPriority.MONITOR)
public void storeTokens(GameStateChangeEvent event)
public void storeTokens(PlayerPrepareTeleportEvent event)
{
if (event.GetState() != GameState.Prepare)
return;
for (Player player : GetPlayers(true))
{
_tokens.put(player.getName(), new EvoToken(player, GetKit(player) == null ? _kits.get(0) : GetKit(player)));
upgradeKit(player, false);
}
_tokens.put(event.GetPlayer().getName(), new EvoToken(event.GetPlayer(), GetKit(event.GetPlayer()) == null ? _kits.get(0) : GetKit(event.GetPlayer())));
upgradeKit(event.GetPlayer(), false);
}
// //Double Kit
// @EventHandler(priority = EventPriority.MONITOR)
// public void storeTokens(GameStateChangeEvent event)
// {
// if (event.GetState() != GameState.Prepare)
// return;
//
// for (Player player : GetPlayers(true))
// {
// _tokens.put(player.getName(), new EvoToken(player, GetKit(player) == null ? _kits.get(0) : GetKit(player)));
//
// upgradeKit(player, false);
// }
// }
@EventHandler(priority = EventPriority.MONITOR)
public void showKit(GameStateChangeEvent event)
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/perks/PerkFlamingSwordEVO.java
View File

@ -125,7 +125,7 @@ public class PerkFlamingSwordEVO extends Perk
{
//Fire
Item fire = player.getWorld().dropItem(player.getEyeLocation(), ItemStackFactory.Instance.CreateStack(Material.BLAZE_POWDER));
Manager.GetFire().Add(fire, player, 0.7, 0, 0.5, 1.5, "Inferno");
Manager.GetFire().Add(fire, player, 0.7, 0, 0.5, 1, "Inferno");
fire.teleport(player.getEyeLocation());
double x = 0.07 - (UtilMath.r(14)/100d);