Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2025-03-10 21:49:53 +01:00
Code Issues Projects Releases Wiki Activity

Adjust on-ground handling: fix and bring back "shortcut" check.

Browse Source 
It is not just a shortcut, it also prevents survivalfly alerts in case
the player is stuck.
This commit is contained in:
asofold 2013-03-05 07:53:37 +01:00
parent 7bf1e24b93
commit ce6a8b4498
2 changed files with 56 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
NCPCompat/src/main/java/fr/neatmonster/nocheatplus/utilities/BlockProperties.java
View File

@ -1394,7 +1394,10 @@ public class BlockProperties {
final int id = access.getTypeId(x, y, z);
if ((blockFlags[id] & flags) != 0){
// Might collide.
if (collidesBlock(access, minX, minY, minZ, maxX, maxY, maxZ, x, y, z, id)) return true;
final double[] bounds = access.getBounds(x, y, z);
if (bounds != null){
if (collidesBlock(access, minX, minY, minZ, maxX, maxY, maxZ, x, y, z, id, bounds, flags)) return true;
}
}
}
}
@ -1456,8 +1459,11 @@ public class BlockProperties {
for (int z = iMinZ; z <= iMaxZ; z++){
for (int y = iMinY; y <= iMaxY; y++){
if (id == access.getTypeId(x, y, z)){
if (collidesBlock(access, minX, minY, minZ, maxX, maxY, maxZ, x, y, z, id)){
return true;
final double[] bounds = access.getBounds(x, y, z);
if (bounds != null){
if (collidesBlock(access, minX, minY, minZ, maxX, maxY, maxZ, x, y, z, id, bounds, blockFlags[id])){
return true;
}
}
}
}
@ -1482,6 +1488,27 @@ public class BlockProperties {
final double[] bounds = access.getBounds(x,y,z);
if (bounds == null) return false; // TODO: policy ?
final long flags = blockFlags[id];
return collidesBlock(access, minX, minY, minZ, maxX, maxY, maxZ, x, y, z, id, bounds, flags);
}
/**
* Check if the bounds collide with the block for the given type id at the given position.
* @param access
* @param minX
* @param minY
* @param minZ
* @param maxX
* @param maxY
* @param maxZ
* @param x
* @param y
* @param z
* @param id
* @param bounds Not null
* @param flags
* @return
*/
public static final boolean collidesBlock(final BlockCache access, final double minX, double minY, final double minZ, final double maxX, final double maxY, final double maxZ, final int x, final int y, final int z, final int id, final double[] bounds, final long flags){
final double bminX, bminZ, bminY;
final double bmaxX, bmaxY, bmaxZ;
if ((flags & F_STAIRS) != 0){ // TODO: make this a full block flag ?
@ -1569,26 +1596,27 @@ public class BlockProperties {
for (int z = iMinZ; z <= iMaxZ; z++){
for (int y = iMinY; y <= iMaxY; y++){
final int id = access.getTypeId(x, y, z);
if ((blockFlags[id] & F_GROUND) != 0 && (blockFlags[id] & ignoreFlags) == 0){
final long flags = blockFlags[id];
if ((flags & F_GROUND) != 0 && (flags & ignoreFlags) == 0){
// Might collide.
if (collidesBlock(access, minX, minY, minZ, maxX, maxY, maxZ, x, y, z, id)){
final double[] bounds = access.getBounds(x, y, z);
if (collidesBlock(access, minX, minY, minZ, maxX, maxY, maxZ, x, y, z, id, bounds, flags)){
if (y >= maxBlockY) return true;
final int aboveId = access.getTypeId(x, y + 1, z);
final long flags = blockFlags[aboveId];
final long aboveFlags = blockFlags[aboveId];
if ((flags & F_IGN_PASSABLE) != 0); // Ignore these.
else if ((flags & F_GROUND) != 0 && (flags & ignoreFlags) == 0){
else if ((aboveFlags & F_GROUND) != 0 && (aboveFlags & ignoreFlags) == 0){
// Check against spider type hacks.
if (collidesBlock(access, minX, minY, minZ, maxX, Math.max(maxY, 1.49 + y), maxZ, x, y + 1, z, aboveId)){
final double[] aboveBounds = access.getBounds(x, y + 1, z);
if (aboveBounds == null) return true;
if (collidesBlock(access, minX, minY, minZ, maxX, Math.max(maxY, 1.49 + y), maxZ, x, y + 1, z, aboveId, aboveBounds, aboveFlags)){
// TODO: This might be seen as a violation for many block types.
// TODO: More distinction necessary here.
if ((blockFlags[id] & F_VARIABLE) != 0 || (blockFlags[aboveId] & F_VARIABLE) != 0){
if ((flags & F_VARIABLE) != 0 || (aboveFlags & F_VARIABLE) != 0){
// TODO: further exclude simple full shape blocks, or confine to itchy block types
// TODO: make flags for it.
// Simplistic hot fix attempt for same type + same shape.
final double[] bounds = access.getBounds(x, y, z);
if (bounds == null) return true;
final double[] aboveBounds = access.getBounds(x, y + 1, z);
if (aboveBounds == null) return true;
boolean fullBounds = false;
for (int i = 0; i < 3; i++){
if (bounds[i] != 0.0 || bounds[i + 3] != 1.0){

30
NCPCompat/src/main/java/fr/neatmonster/nocheatplus/utilities/PlayerLocation.java
View File

@ -438,24 +438,26 @@ public class PlayerLocation {
if (notOnGroundMaxY >= yOnGround) onGround = false;
else if (onGroundMinY <= yOnGround) onGround = true;
else{
// Shortcut check (currently needed for being stuck + sf).
if (blockFlags == null || (blockFlags.longValue() & BlockProperties.F_GROUND) != 0){
// // TODO: Consider dropping this shortcut.
// final int id = getTypeIdBelow();
// final long flags = BlockProperties.getBlockFlags(id);
// if ((flags & BlockProperties.F_GROUND) != 0 && (flags & BlockProperties.F_VARIABLE) == 0){
// final double[] bounds = blockCache.getBounds(blockX, blockY -1, blockZ);
// if (BlockProperties.collidesBlock(blockCache, x, minY - yOnGround, z, x, minY, z, blockX, blockY - 1, blockZ, id, bounds, flags)){
// // TODO: passable vs maxY ?
// if (!BlockProperties.isPassableWorkaround(blockCache, blockX, blockY - 1, blockZ, id, minX, minY, minZ, maxX, minY, maxZ)){
// onGround = true;
// }
// }
// }
// if (onGround == null){
// TODO: Consider dropping this shortcut.
final int bY = Location.locToBlock(y - yOnGround);
final int id = bY == blockY ? getTypeId() : (bY == blockY -1 ? getTypeIdBelow() : blockCache.getTypeId(blockX, bY, blockZ));
final long flags = BlockProperties.getBlockFlags(id);
if ((flags & BlockProperties.F_GROUND) != 0 && (flags & BlockProperties.F_VARIABLE) == 0){
final double[] bounds = blockCache.getBounds(blockX, bY, blockZ);
if (BlockProperties.collidesBlock(blockCache, x, minY - yOnGround, z, x, minY, z, blockX, bY, blockZ, id, bounds, flags)){
// TODO: passable vs maxY ?
if (!BlockProperties.isPassableWorkaround(blockCache, blockX, bY, blockZ, minX - blockX, minY - yOnGround - bY, minZ - blockZ, id, maxX - minX, yOnGround, maxZ - minZ, 1.0)){
onGround = true;
}
}
}
if (onGround == null){
// Full on-ground check (blocks).
// Note: Might check for half-block height too (getTypeId), but that is much more seldom.
onGround = BlockProperties.isOnGround(blockCache, minX, minY - yOnGround, minZ, maxX, minY, maxZ, 0L);
// }
}
}
else onGround = false;
}