From a3f39037609adbf14bf4ecd0971c14dcbd0941d8 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 11 May 2014 18:05:51 +0200 Subject: [PATCH] Increase default nuking block place threshold. Resolves #169 --- buildnumber.properties | 4 ++-- src/config.yml | 2 +- .../Listener/TFM_BlockListener.java | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/buildnumber.properties b/buildnumber.properties index 7ba3e978..c025ec48 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Mon May 05 16:09:04 CEST 2014 -build.number=824 +#Sun May 11 18:05:04 CEST 2014 +build.number=826 diff --git a/src/config.yml b/src/config.yml index 5f1e389d..c45b7ff1 100644 --- a/src/config.yml +++ b/src/config.yml @@ -95,7 +95,7 @@ auto_wipe: true nukemonitor: enabled: true count_break: 100 - count_place: 25 + count_place: 40 range: 10.0 freecam_trigger_count: 10 diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java index 961e34bc..83a8cf64 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java @@ -35,23 +35,23 @@ public class TFM_BlockListener implements Listener @EventHandler(priority = EventPriority.NORMAL) public void onBlockBreak(BlockBreakEvent event) { - Player player = event.getPlayer(); - Location blockLocation = event.getBlock().getLocation(); + final Player player = event.getPlayer(); + final Location location = event.getBlock().getLocation(); if (TFM_ConfigEntry.NUKE_MONITOR_ENABLED.getBoolean()) { - TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); + final TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); - Location playerLocation = player.getLocation(); + final Location playerLocation = player.getLocation(); final double nukeMonitorRange = TFM_ConfigEntry.NUKE_MONITOR_RANGE.getDouble().doubleValue(); boolean outOfRange = false; - if (!playerLocation.getWorld().equals(blockLocation.getWorld())) + if (!playerLocation.getWorld().equals(location.getWorld())) { outOfRange = true; } - else if (playerLocation.distanceSquared(blockLocation) > (nukeMonitorRange * nukeMonitorRange)) + else if (playerLocation.distanceSquared(location) > (nukeMonitorRange * nukeMonitorRange)) { outOfRange = true; } @@ -70,7 +70,7 @@ public class TFM_BlockListener implements Listener } } - Long lastRan = TFM_Heartbeat.getLastRan(); + final Long lastRan = TFM_Heartbeat.getLastRan(); if (lastRan == null || lastRan + TotalFreedomMod.HEARTBEAT_RATE * 1000L < System.currentTimeMillis()) { // TFM_Log.warning("Heartbeat service timeout - can't check block place/break rates."); @@ -94,7 +94,7 @@ public class TFM_BlockListener implements Listener { if (!TFM_AdminList.isSuperAdmin(player)) { - if (TFM_ProtectedArea.isInProtectedArea(blockLocation)) + if (TFM_ProtectedArea.isInProtectedArea(location)) { event.setCancelled(true); }