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 23:14:23 +11:00
parent 9118e79d9a
commit 567b7c4a7b
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -564,7 +564,16 @@ public class Gravity extends SoloGame
obj.AddVelocity(UtilAlg.getTrajectory(proj, obj.Base).multiply(0.4), 10);
obj.CustomCollide(null);
//obj.CustomCollide(null);
if (obj.Ent instanceof Player)
{
//Damage Event
Manager.GetDamage().NewDamageEvent((Player)obj.Ent, proj.getShooter(), null,
DamageCause.CUSTOM, 1, false, true, true,
UtilEnt.getName(proj.getShooter()), "Sonic Blast");
}
obj.GrabDelay = System.currentTimeMillis();
obj.SetMovingBat(true);

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

@ -173,7 +173,7 @@ public class GravityPlayer extends GravityObject
UtilPlayer.message(Ent, F.main("Game", "Restoring Oxygen..."));
Ent.getWorld().playSound(Ent.getLocation(), Sound.CAT_HISS, 0.2f, 0.5f);
Base.setHealth(Math.min(60, Base.getHealth() + 6));
Base.setHealth(Math.min(60, Base.getHealth() + 10));
}
//Lose
else