Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-06-26 06:14:42 +02:00
Code Issues Projects Releases Wiki Activity

Rename BlockChangeReference.entry to lastUsedEntry, comments.

Browse Source
This commit is contained in:
asofold 2016-11-20 14:51:08 +01:00
parent 7fb1da6dc5
commit 24b45ae5d9
4 changed files with 17 additions and 8 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/MovingData.java
View File

@ -1199,7 +1199,7 @@ public class MovingData extends ACheckData {
* @param to
*/
public void updateBlockChangeReference(final BlockChangeEntry entry, final RichBoundsLocation to) {
blockChangeRef.entry = entry; // Unchecked.
blockChangeRef.lastUsedEntry = entry; // Unchecked.
if (to.isBlockIntersecting(entry.x, entry.y, entry.z)) {
blockChangeRef.valid = true;
}

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

@ -190,8 +190,14 @@ public class BlockChangeTracker {
*/
public static class BlockChangeReference {
/** Last used block change id.*/
public BlockChangeEntry entry = null;
/*
* TODO: public BlockChangeEntry firstUsedEntry = null; // Would the
* span suffice? Consider using span + timing or just the span during
* one check covering multiple blocks.
*/
/** Last used block change entry, highest id.*/
public BlockChangeEntry lastUsedEntry = null;
/** Indicate if the set id can still be used.*/
public boolean valid = false;
@ -207,7 +213,7 @@ public class BlockChangeTracker {
* @return
*/
public boolean canUpdateWith(final BlockChangeEntry entry) {
return this.entry == null || entry.id > this.entry.id || entry.id == this.entry.id && valid;
return this.lastUsedEntry == null || entry.id > this.lastUsedEntry.id || entry.id == this.lastUsedEntry.id && valid;
}
/**
@ -217,7 +223,7 @@ public class BlockChangeTracker {
*/
public BlockChangeReference copy() {
final BlockChangeReference copy = new BlockChangeReference();
copy.entry = this.entry;
copy.lastUsedEntry = this.lastUsedEntry;
copy.valid = this.valid;
return copy;
}
@ -228,7 +234,7 @@ public class BlockChangeTracker {
return false;
}
final BlockChangeReference other = (BlockChangeReference) obj;
return valid == other.valid && (entry != null && entry.equals(other.entry) || entry == null && other.entry == null);
return valid == other.valid && (lastUsedEntry != null && lastUsedEntry.equals(other.lastUsedEntry) || lastUsedEntry == null && other.lastUsedEntry == null);
}
}
@ -415,8 +421,7 @@ public class BlockChangeTracker {
}
/**
* Add a block change. Simplistic version (no actual block states/shapes are
* stored).
* Add a block change.
*
* @param x
* @param y
@ -426,6 +431,7 @@ public class BlockChangeTracker {
*/
private void addBlockChange(final long changeId, final int tick, final WorldNode worldNode, final int x, final int y, final int z, final Direction direction) {
worldNode.lastChangeTick = tick;
// TODO: Efficient way of using a block cache for shapes here (possibly better create the entry in addPistonBlocks).
final BlockChangeEntry entry = new BlockChangeEntry(changeId, tick, x, y, z, direction);
LinkedList<BlockChangeEntry> entries = worldNode.blocks.get(x, y, z, MoveOrder.END);
if (entries == null) {

2
NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/collision/ICollidePassable.java
View File

@ -28,6 +28,8 @@ public interface ICollidePassable extends ICollideBlocks, ISetMargins {
public void setBlockCache(BlockCache blockCache);
public BlockCache getBlockCache();
// TODO: public void (bool?) setBlockChangeReference(tracker, reference).
/**
* Convenience: Call set and setBlockCache with the data from the
* PlayerLocation instances. Should use from.getBlockCache() as BlockCache

1
NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/collision/PassableAxisTracing.java
View File

@ -47,6 +47,7 @@ public class PassableAxisTracing extends AxisTracing implements ICollidePassable
if (BlockProperties.isPassableBox(blockCache, blockX, blockY, blockZ, minX, minY, minZ, maxX, maxY, maxZ)) {
return true;
}
// TODO: if (blockChangeTracker != null && -- check with BlockChangeTracker and BlockChangeReference --
else {
collides = true;
return false;