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

More useful method naming and behavior for getting IBlockCacheNodeS.

Browse Source
This commit is contained in:
asofold 2016-11-28 00:04:30 +01:00
parent 4fdca46ccb
commit 511bcfd4ad
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -582,7 +582,7 @@ public class BlockChangeTracker {
// TODO: Test which ones can actually move a player (/how).
// Add this block.
addBlockChange(changeId, tick, worldNode, x, y, z, Direction.getDirection(blockFace),
blockCache.getBlockCacheNode(x, y, z, true));
blockCache.getOrCreateBlockCacheNode(x, y, z, true));
}
/**

31
NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/map/BlockCache.java
View File

@ -348,31 +348,42 @@ public abstract class BlockCache {
}
/**
* Get the internally stored BlockCacheNode instance for the given
* coordinates. Creation/updating is controlled with forceSetAll.
* Get an IBlockCacheNode instance for the given coordinates. With
* forceSetAll set to true, it will be ensured that all properties are set
* for the returned node.
*
* @param x
* @param y
* @param z
* @param forceSetAll
* @return If forceSetAll is true, a node will always be returned with all
* properties set. If forceSetAll is false, null might be returned,
* if no node is present for the given coordinates.
* properties set. If forceSetAll is false, a node with at least the
* id set will be returned.
*/
public IBlockCacheNode getBlockCacheNode(int x, int y, int z, boolean forceSetAll) {
public IBlockCacheNode getOrCreateBlockCacheNode(int x, int y, int z, boolean forceSetAll) {
final BlockCacheNode node = getOrCreateNode(x, y, z);
if (forceSetAll) {
final BlockCacheNode node = getOrCreateNode(x, y, z);
if (!node.isDataFetched()) {
node.setData(fetchData(x, y, z));
}
if (!node.isBoundsFetched()) {
node.setBounds(fetchBounds(x, y, z));
}
return node;
}
else {
return nodeMap.get(x, y, z);
}
return node;
}
/**
* Just return the internally stored node for these coordinates, or null if
* none is there.
*
* @param x
* @param y
* @param z
* @return
*/
public IBlockCacheNode getBlockCacheNode(int x, int y, int z) {
return nodeMap.get(x, y, z);
}
/**