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

fixed several smash bugs and one global issue

Browse Source
This commit is contained in:
fooify 2015-11-13 17:28:25 -08:00
parent a0c0f6b891
commit f9f4c2addc
4 changed files with 6 additions and 3 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/monstermaze/MonsterMaze.java
View File

@ -225,7 +225,7 @@ public class MonsterMaze extends SoloGame
p.playSound(p.getLocation(), Sound.CHICKEN_EGG_POP, 1.0f, 1.0f);
Recharge.Instance.useForce(p, "MM Player Jump", 900);
Recharge.Instance.useForce(p, "MM Player Jump", 750);
//Find blocks below a player
for (int i = 0 ; i < 3 ; i++)

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitCreeper.java
View File

@ -61,7 +61,7 @@ public class KitCreeper extends SmashKit
}));
player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.IRON_SPADE, (byte)0, 1,
C.cYellow + C.Bold + "Right-Click" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Explosive Leap",
C.cYellow + C.Bold + "Right-Click" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Explode",
new String[]
{
ChatColor.RESET + "You freeze in location and charge up",

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDoubleJump.java
View File

@ -120,7 +120,7 @@ public class PerkDoubleJump extends Perk
if (_recharge > 0 && !Recharge.Instance.usable(player, GetName()))
continue;
if (UtilEnt.isGrounded(player) || UtilBlock.solid(player.getLocation().getBlock().getRelative(BlockFace.DOWN)))
if (player.isOnGround() || (UtilBlock.solid(player.getLocation().getBlock().getRelative(BlockFace.DOWN)) && UtilBlock.solid(player.getLocation().getBlock())))
player.setAllowFlight(true);
}
}

3
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitchPotion.java
View File

@ -109,6 +109,8 @@ public class PerkWitchPotion extends SmashPerk
Manager.GetDamage().NewDamageEvent(player, thrower, null,
DamageCause.CUSTOM, 5, true, true, false,
UtilEnt.getName((LivingEntity)event.getEntity().getShooter()), GetName());
Manager.GetCondition().Factory().Slow("Witch Potion", player, null, 3, 1, true, false, false, false);
}
//Super Effect
else
@ -121,6 +123,7 @@ public class PerkWitchPotion extends SmashPerk
DamageCause.CUSTOM, 5 + bonus, true, true, false,
UtilEnt.getName((LivingEntity)event.getEntity().getShooter()), GetName());
Manager.GetCondition().Factory().Slow("Witch Potion", player, null, 7, 2, true, false, false, false);
//Manager.GetCondition().Factory().Confuse(reason, ent, source, duration, mult, extend, showIndicator, ambient)
}
}