fixed paintball pre-game bug
This commit is contained in:
parent
e4871c4988
commit
7191d48bd0
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue