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

fixed paintball pre-game bug

This commit is contained in:
Chiss 2014-08-11 14:25:11 +10:00
parent e4871c4988
commit 7191d48bd0
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java
View File

@ -323,7 +323,7 @@ public class ParkourManager extends MiniPlugin
if (!isParkourMode(player)) if (!isParkourMode(player))
{ {
//Inform //Inform
UtilPlayer.message(player, F.main("Parkour", "Cannot finish parkour unless you are in " + F.elem("Parkour Mode") + ".")); UtilPlayer.message(player, F.main("Parkour", "You must be in " + F.elem("Parkour Mode") + " to finish."));
UtilPlayer.message(player, F.main("Parkour", "Talk to the " + F.elem("Start NPC") + " to enter Parkour Mode.")); UtilPlayer.message(player, F.main("Parkour", "Talk to the " + F.elem("Start NPC") + " to enter Parkour Mode."));
return; return;
} }

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/Paintball.java
View File

@ -173,6 +173,9 @@ public class Paintball extends TeamGame
@EventHandler @EventHandler
public void PaintballDamage(CustomDamageEvent event) public void PaintballDamage(CustomDamageEvent event)
{ {
if (!IsLive())
return;
if (event.GetProjectile() == null) if (event.GetProjectile() == null)
return; return;
@ -314,6 +317,9 @@ public class Paintball extends TeamGame
@EventHandler @EventHandler
public void CleanHit(ProjectileHitEvent event) public void CleanHit(ProjectileHitEvent event)
{ {
if (!IsLive())
return;
if (!_water.remove(event.getEntity())) if (!_water.remove(event.getEntity()))
return; return;