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

Make sound of piston explosions toggleable (#996)

Browse Source
This commit is contained in:
Frank van der Heijden 2020-10-11 20:59:17 -07:00 committed by GitHub
parent 97cbd80a70
commit e4a666f8be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/me/ryanhamshire/GriefPrevention/BlockEventHandler.java
View File

@ -664,7 +664,10 @@ public class BlockEventHandler implements Listener
if (pistonClaim == null || !Objects.equals(pistonClaim.ownerID, claim.ownerID)) if (pistonClaim == null || !Objects.equals(pistonClaim.ownerID, claim.ownerID))
{ {
event.setCancelled(true); event.setCancelled(true);
pistonBlock.getWorld().createExplosion(pistonBlock.getLocation(), 0); if (GriefPrevention.instance.config_pistonExplosionSound)
{
pistonBlock.getWorld().createExplosion(pistonBlock.getLocation(), 0);
}
pistonBlock.getWorld().dropItem(pistonBlock.getLocation(), new ItemStack(event.isSticky() ? Material.STICKY_PISTON : Material.PISTON)); pistonBlock.getWorld().dropItem(pistonBlock.getLocation(), new ItemStack(event.isSticky() ? Material.STICKY_PISTON : Material.PISTON));
pistonBlock.setType(Material.AIR); pistonBlock.setType(Material.AIR);
return; return;
@ -1029,7 +1032,7 @@ public class BlockEventHandler implements Listener
} }
} }
} }
@EventHandler(ignoreCancelled = true) @EventHandler(ignoreCancelled = true)
public void onItemFrameBrokenByBoat(final HangingBreakEvent event) public void onItemFrameBrokenByBoat(final HangingBreakEvent event)
{ {

3
src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java
View File

@ -209,6 +209,7 @@ public class GriefPrevention extends JavaPlugin
public boolean config_limitTreeGrowth; //whether trees should be prevented from growing into a claim from outside public boolean config_limitTreeGrowth; //whether trees should be prevented from growing into a claim from outside
public PistonMode config_pistonMovement; //Setting for piston check options public PistonMode config_pistonMovement; //Setting for piston check options
public boolean config_pistonExplosionSound; //whether pistons make an explosion sound when they get removed
public boolean config_advanced_fixNegativeClaimblockAmounts; //whether to attempt to fix negative claim block amounts (some addons cause/assume players can go into negative amounts) public boolean config_advanced_fixNegativeClaimblockAmounts; //whether to attempt to fix negative claim block amounts (some addons cause/assume players can go into negative amounts)
public int config_advanced_claim_expiration_check_rate; //How often GP should check for expired claims, amount in seconds public int config_advanced_claim_expiration_check_rate; //How often GP should check for expired claims, amount in seconds
@ -594,6 +595,7 @@ public class GriefPrevention extends JavaPlugin
this.config_blockSurfaceOtherExplosions = config.getBoolean("GriefPrevention.BlockSurfaceOtherExplosions", true); this.config_blockSurfaceOtherExplosions = config.getBoolean("GriefPrevention.BlockSurfaceOtherExplosions", true);
this.config_blockSkyTrees = config.getBoolean("GriefPrevention.LimitSkyTrees", true); this.config_blockSkyTrees = config.getBoolean("GriefPrevention.LimitSkyTrees", true);
this.config_limitTreeGrowth = config.getBoolean("GriefPrevention.LimitTreeGrowth", false); this.config_limitTreeGrowth = config.getBoolean("GriefPrevention.LimitTreeGrowth", false);
this.config_pistonExplosionSound = config.getBoolean("GriefPrevention.PistonExplosionSound", true);
this.config_pistonMovement = PistonMode.of(config.getString("GriefPrevention.PistonMovement", "CLAIMS_ONLY")); this.config_pistonMovement = PistonMode.of(config.getString("GriefPrevention.PistonMovement", "CLAIMS_ONLY"));
if (config.isBoolean("GriefPrevention.LimitPistonsToLandClaims") && !config.getBoolean("GriefPrevention.LimitPistonsToLandClaims")) if (config.isBoolean("GriefPrevention.LimitPistonsToLandClaims") && !config.getBoolean("GriefPrevention.LimitPistonsToLandClaims"))
this.config_pistonMovement = PistonMode.EVERYWHERE_SIMPLE; this.config_pistonMovement = PistonMode.EVERYWHERE_SIMPLE;
@ -852,6 +854,7 @@ public class GriefPrevention extends JavaPlugin
outConfig.set("GriefPrevention.PistonMovement", this.config_pistonMovement.name()); outConfig.set("GriefPrevention.PistonMovement", this.config_pistonMovement.name());
outConfig.set("GriefPrevention.CheckPistonMovement", null); outConfig.set("GriefPrevention.CheckPistonMovement", null);
outConfig.set("GriefPrevention.LimitPistonsToLandClaims", null); outConfig.set("GriefPrevention.LimitPistonsToLandClaims", null);
outConfig.set("GriefPrevention.PistonExplosionSound", this.config_pistonExplosionSound);
outConfig.set("GriefPrevention.FireSpreads", this.config_fireSpreads); outConfig.set("GriefPrevention.FireSpreads", this.config_fireSpreads);
outConfig.set("GriefPrevention.FireDestroys", this.config_fireDestroys); outConfig.set("GriefPrevention.FireDestroys", this.config_fireDestroys);