Messaging update for siege mode.

This commit is contained in:
ryanhamshire 2015-08-29 10:53:38 -07:00
parent e688627304
commit 455d422c1f
2 changed files with 6 additions and 3 deletions

View File

@ -218,7 +218,7 @@ public class BlockEventHandler implements Listener
playerData.lastClaim = claim;
//warn about TNT not destroying claimed blocks
if(block.getType() == Material.TNT && !claim.areExplosivesAllowed)
if(block.getType() == Material.TNT && !claim.areExplosivesAllowed && playerData.siegeData == null)
{
GriefPrevention.sendMessage(player, TextMode.Warn, Messages.NoTNTDamageClaims);
GriefPrevention.sendMessage(player, TextMode.Instr, Messages.ClaimExplosivesAdvertisement);
@ -342,7 +342,8 @@ public class BlockEventHandler implements Listener
if( GriefPrevention.instance.config_blockSurfaceOtherExplosions && block.getType() == Material.TNT &&
block.getWorld().getEnvironment() != Environment.NETHER &&
block.getY() > GriefPrevention.instance.getSeaLevel(block.getWorld()) - 5 &&
claim == null)
claim == null &&
playerData.siegeData == null)
{
GriefPrevention.sendMessage(player, TextMode.Warn, Messages.NoTNTDamageAboveSeaLevel);
}

View File

@ -2037,6 +2037,8 @@ public class GriefPrevention extends JavaPlugin
//confirmation message for attacker, warning message for defender
GriefPrevention.sendMessage(defender, TextMode.Warn, Messages.SiegeAlert, attacker.getName());
GriefPrevention.sendMessage(player, TextMode.Success, Messages.SiegeConfirmed, defender.getName());
return true;
}
else if(cmd.getName().equalsIgnoreCase("softmute"))
{