From f45cc118460795949b896b87b01acf739e48e9c2 Mon Sep 17 00:00:00 2001 From: JeromSar Date: Tue, 27 Aug 2013 12:09:58 +0200 Subject: [PATCH] Don't track blockchanges from Superadmins --- .../Listener/TFM_BlockListener.java | 22 ++++++++++++------- .../TotalFreedomMod/TFM_RollbackManager.java | 8 +++---- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java index 60f94462..75d34794 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java @@ -72,7 +72,7 @@ public class TFM_BlockListener implements Listener 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."); + // TFM_Log.warning("Heartbeat service timeout - can't check block place/break rates."); } else { @@ -101,12 +101,6 @@ public class TFM_BlockListener implements Listener } } - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) - public void onRollbackBlockBreak(BlockBreakEvent event) - { - TFM_RollbackManager.blockBreak(event); - } - @EventHandler(priority = EventPriority.HIGH) public void onBlockPlace(BlockPlaceEvent event) { @@ -252,10 +246,22 @@ public class TFM_BlockListener implements Listener } } + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + public void onRollbackBlockBreak(BlockBreakEvent event) + { + if (!TFM_SuperadminList.isUserSuperadmin(event.getPlayer())) + { + TFM_RollbackManager.blockBreak(event); + } + } + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onRollbackBlockPlace(BlockPlaceEvent event) { - TFM_RollbackManager.blockPlace(event); + if (!TFM_SuperadminList.isUserSuperadmin(event.getPlayer())) + { + TFM_RollbackManager.blockPlace(event); + } } @EventHandler(priority = EventPriority.HIGH) diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_RollbackManager.java b/src/me/StevenLawson/TotalFreedomMod/TFM_RollbackManager.java index 591fe35d..6064eec1 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_RollbackManager.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_RollbackManager.java @@ -197,22 +197,22 @@ public class TFM_RollbackManager { return Material.getMaterial(blockId); } - + public int getX() { return x; } - + public int getY() { return y; } - + public int getZ() { return z; } - + public byte getData() { return data;