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

Minor fixes

Browse Source
This commit is contained in:
Chiss 2014-01-21 22:57:49 +11:00
parent b0ea211ae3
commit 9118e79d9a
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gravity/Gravity.java
View File

@ -196,7 +196,7 @@ public class Gravity extends SoloGame
Player player = event.getPlayer(); Player player = event.getPlayer();
if (!Recharge.Instance.use(player, "Block Cannon", 1200, true)) if (!Recharge.Instance.use(player, "Sonic Blast", 1200, true))
return; return;
//Projectile //Projectile

19
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkHorseKick.java
View File

@ -67,11 +67,11 @@ public class PerkHorseKick extends Perk
return; return;
//Horse Animation //Horse Animation
DisguiseBase horse = Manager.GetDisguise().getDisguise(player); //DisguiseBase horse = Manager.GetDisguise().getDisguise(player);
if (horse != null && horse instanceof DisguisePig) //if (horse != null && horse instanceof DisguiseHorse)
{ //{
//((CraftHorse)player).getHandle().p(true); //XXX //((CraftHorse)player).getHandle().p(true); //XXX MAKE LEGS KICK AIR HERE
} //}
//Animation //Animation
_active.put(player, System.currentTimeMillis()); _active.put(player, System.currentTimeMillis());
@ -156,7 +156,14 @@ public class PerkHorseKick extends Perk
if (!player.isValid() || player.getHealth() <= 0 || UtilTime.elapsed(_active.get(player), 1000)) if (!player.isValid() || player.getHealth() <= 0 || UtilTime.elapsed(_active.get(player), 1000))
{ {
playerIterator.remove(); playerIterator.remove();
//((CraftHorse)player).getHandle().p(false); //XXX
//Horse Animation
//DisguiseBase horse = Manager.GetDisguise().getDisguise(player);
//if (horse != null && horse instanceof DisguiseHorse)
//{
//((CraftHorse)player).getHandle().p(true); //XXX STOP KICKING AIR HERE
//}
Manager.GetCondition().EndCondition(player, null, GetName()); Manager.GetCondition().EndCondition(player, null, GetName());
} }
else else