Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Messaging update for siege mode.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/me/ryanhamshire/GriefPrevention/BlockEventHandler.java
View File

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

4
src/me/ryanhamshire/GriefPrevention/GriefPrevention.java
View File

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