Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-07-05 18:44:46 +02:00
Code Issues Projects Releases Wiki Activity

Ignore Blockbreak events if the block clearly wasn't broken by a

Browse Source 
player manually
This commit is contained in:
Evenprime 2012-01-01 15:15:20 +01:00
parent 5818a32fc0
commit 5d56a8c66c
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cc/co/evenprime/bukkit/nocheat/checks/blockbreak/BlockBreakData.java
View File

@ -30,6 +30,7 @@ public class BlockBreakData implements DataItem {
public double reachDistance;
public boolean armswung = true;
public final SimpleLocation lastDamagedBlock = new SimpleLocation();
@Override
public void clearCriticalData() {

27
src/cc/co/evenprime/bukkit/nocheat/checks/blockbreak/BlockBreakEventManager.java
View File

@ -57,6 +57,14 @@ public class BlockBreakEventManager extends EventManagerImpl {
data.brokenBlockLocation.set(event.getBlock());
// Only if the block got damaged before, do the check(s)
if(!data.brokenBlockLocation.equals(data.lastDamagedBlock)) {
// Something caused a blockbreak event that's not from the player
// Don't check it at all
data.lastDamagedBlock.reset();
return;
}
for(BlockBreakCheck check : checks) {
// If it should be executed, do it
if(!cancelled && check.isEnabled(cc) && !player.hasPermission(check.getPermission())) {
@ -71,13 +79,20 @@ public class BlockBreakEventManager extends EventManagerImpl {
@Override
protected void handleBlockDamageEvent(final BlockDamageEvent event, final Priority priority) {
// Only interested in insta-break events here
if(!event.getInstaBreak())
return;
NoCheatPlayer player = plugin.getPlayer(event.getPlayer());
BlockBreakData data = BlockBreakCheck.getData(player.getDataStore());
// Only interested in insta-break events here
if(event.getInstaBreak()) {
// Remember this location. We ignore block breaks in the block-break
// direction check that are insta-breaks
data.instaBrokenBlockLocation.set(event.getBlock());
}
// Remember this location. Only blockbreakevents for this specific block
// will be handled at all
data.lastDamagedBlock.set(event.getBlock());
// Remember this location. We ignore block breaks in the block-break
// direction check that are insta-breaks
BlockBreakCheck.getData(plugin.getPlayer(event.getPlayer()).getDataStore()).instaBrokenBlockLocation.set(event.getBlock());
}
@Override

9
src/cc/co/evenprime/bukkit/nocheat/data/SimpleLocation.java
View File

@ -23,6 +23,15 @@ public final class SimpleLocation {
return block.getX() == x && block.getY() == y && block.getZ() == z;
}
public final boolean equals(SimpleLocation simpleLocation) {
if(!isSet() && !simpleLocation.isSet())
return true;
else if(!isSet() || !simpleLocation.isSet())
return false;
return simpleLocation.x == x && simpleLocation.y == y && simpleLocation.z == z;
}
public final void set(Block block) {
x = block.getX();
y = block.getY();