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

Disambiguate + fix redundant method call.

Browse Source
This commit is contained in:
asofold 2017-01-08 16:08:21 +01:00
parent f560e756f5
commit 6bcaef9057
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java
View File

@ -662,7 +662,7 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
// TODO: More adaptive margin / method (bounding boxes).
final boolean useBlockChangeTracker = cc.trackBlockMove && (cc.passableCheck || checkSf || checkCf)
&& blockChangeTracker.hasActivity(from.getWorld().getUID(), pFrom, pTo, 1.5625);
&& blockChangeTracker.hasActivityShuffled(from.getWorld().getUID(), pFrom, pTo, 1.5625);
if (checkSf || checkCf) {
// Ensure we have a set-back set.

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

@ -816,7 +816,7 @@ public class BlockChangeTracker {
* @param margin
* @return
*/
public boolean hasActivity(final UUID worldId,
public boolean hasActivityShuffled(final UUID worldId,
final IGetPosition pos1, final IGetPosition pos2, final double margin) {
return hasActivityShuffled(worldId, pos1.getX(), pos1.getY(), pos1.getZ(),
pos2.getX(), pos2.getY(), pos2.getZ(), margin);
@ -885,7 +885,7 @@ public class BlockChangeTracker {
*/
public boolean hasActivity(final UUID worldId, final double minX, final double minY, final double minZ,
final double maxX, final double maxY, final double maxZ) {
return hasActivityShuffled(worldId,
return hasActivity(worldId,
Location.locToBlock(minX), Location.locToBlock(minY), Location.locToBlock(minZ),
Location.locToBlock(maxX), Location.locToBlock(maxY), Location.locToBlock(maxZ));
}