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

Bug fixes

Browse Source
This commit is contained in:
Sam 2017-05-04 21:49:44 +01:00
parent f6cb654e12
commit 2e3d19bd3a
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,6 +121,12 @@ public class KitEnderman extends SmashKit
public void damage(CustomDamageEvent event)
{
Player player = event.GetDamageePlayer();
if (player == null)
{
return;
}
DisguiseBase disguise = Manager.GetDisguise().getActiveDisguise(player);
if (player != null && disguise != null && disguise instanceof DisguiseEnderman)

1
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/creeper/PerkCreeperSulphurBomb.java
View File

@ -105,6 +105,7 @@ public class PerkCreeperSulphurBomb extends SmashPerk
UtilParticle.PlayParticleToAll(ParticleType.EXPLODE, data.getThrown().getLocation(), 0, 0, 0, 0, 1, ViewDist.LONG);
data.getThrown().getWorld().playSound(data.getThrown().getLocation(), Sound.EXPLODE, 1f, 2f);
data.getThrown().remove();
_sulphur.remove(data.getThrower().getUniqueId());
}
};

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/squid/PerkInkBlast.java
View File

@ -56,7 +56,7 @@ public class PerkInkBlast extends SmashPerk implements IThrown
_projectileVelocity = getPerkFloat("Projectile Velocity");
_knockbackMagnitude = getPerkInt("Knockback Magnitude");
_bullets = getPerkInt("Bullets");
_damagePerBullet = getPerkInt("Damage Per Bullet");
_damagePerBullet = getPerkDouble("Damage Per Bullet");
}
@EventHandler