Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-09-27 14:13:11 +02:00
Code Issues Projects Releases Wiki Activity

[BREAKING] Move matchBlockFace to MapUtil.

Browse Source 
(Likely no one is using this by now.)
This commit is contained in:
asofold 2016-12-27 15:33:36 +01:00
parent b406204ce2
commit 1ba300f3af
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
NCPCore/src/main/java/fr/neatmonster/nocheatplus/compat/blocks/changetracker/BlockChangeTracker.java
View File

@ -35,7 +35,6 @@ import fr.neatmonster.nocheatplus.NCPAPIProvider;
import fr.neatmonster.nocheatplus.components.location.IGetPosition;
import fr.neatmonster.nocheatplus.components.registry.event.IGenericInstanceHandle;
import fr.neatmonster.nocheatplus.logging.Streams;
import fr.neatmonster.nocheatplus.utilities.CheckUtils;
import fr.neatmonster.nocheatplus.utilities.TickTask;
import fr.neatmonster.nocheatplus.utilities.ds.map.CoordHashMap;
import fr.neatmonster.nocheatplus.utilities.ds.map.CoordMap;
@ -44,6 +43,7 @@ import fr.neatmonster.nocheatplus.utilities.ds.map.LinkedCoordHashMap.MoveOrder;
import fr.neatmonster.nocheatplus.utilities.map.BlockCache;
import fr.neatmonster.nocheatplus.utilities.map.BlockCache.IBlockCacheNode;
import fr.neatmonster.nocheatplus.utilities.map.BlockProperties;
import fr.neatmonster.nocheatplus.utilities.map.MapUtil;
/**
* Keep track of block changes, to allow mitigation of false positives. Think of
@ -65,12 +65,12 @@ public class BlockChangeTracker {
public static enum Direction {
NONE(BlockFace.SELF),
X_POS(CheckUtils.matchBlockFace(1, 0, 0)),
X_NEG(CheckUtils.matchBlockFace(-1, 0, 0)),
Y_POS(CheckUtils.matchBlockFace(0, 1, 0)),
Y_NEG(CheckUtils.matchBlockFace(0, -1, 0)),
Z_POS(CheckUtils.matchBlockFace(0, 0, 1)),
Z_NEG(CheckUtils.matchBlockFace(0, 0, -1));
X_POS(MapUtil.matchBlockFace(1, 0, 0)),
X_NEG(MapUtil.matchBlockFace(-1, 0, 0)),
Y_POS(MapUtil.matchBlockFace(0, 1, 0)),
Y_NEG(MapUtil.matchBlockFace(0, -1, 0)),
Z_POS(MapUtil.matchBlockFace(0, 0, 1)),
Z_NEG(MapUtil.matchBlockFace(0, 0, -1));
public static Direction getDirection(final BlockFace blockFace) {
final int x = blockFace.getModX();

17
NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/CheckUtils.java
View File

@ -21,7 +21,6 @@ import java.util.Random;
import java.util.Set;
import org.bukkit.Bukkit;
import org.bukkit.block.BlockFace;
import org.bukkit.entity.Player;
import fr.neatmonster.nocheatplus.NCPAPIProvider;
@ -236,20 +235,4 @@ public class CheckUtils {
return NCPAPIProvider.getNoCheatPlusAPI().getGenericInstance(Random.class);
}
/**
* Find the appropriate BlockFace.
* @param x Exact increments.
* @param y
* @param z
* @return
*/
public static BlockFace matchBlockFace(int x, int y, int z) {
for (BlockFace blockFace : BlockFace.values()) {
if (blockFace.getModX() == x && blockFace.getModY() == y && blockFace.getModZ() == z) {
return blockFace;
}
}
return null;
}
}

17
NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/map/MapUtil.java
View File

@ -16,6 +16,7 @@ package fr.neatmonster.nocheatplus.utilities.map;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.block.BlockFace;
import fr.neatmonster.nocheatplus.NCPAPIProvider;
import fr.neatmonster.nocheatplus.logging.Streams;
@ -29,6 +30,22 @@ import fr.neatmonster.nocheatplus.utilities.StringUtil;
*/
public class MapUtil {
/**
* Find the appropriate BlockFace.
* @param x Exact increments.
* @param y
* @param z
* @return
*/
public static BlockFace matchBlockFace(int x, int y, int z) {
for (BlockFace blockFace : BlockFace.values()) {
if (blockFace.getModX() == x && blockFace.getModY() == y && blockFace.getModZ() == z) {
return blockFace;
}
}
return null;
}
/**
* Convenience method to check if the bounds as returned by getBounds cover
* a whole block.