Upstream
/
NoCheatPlus
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Get rid of the IBlockAccess implementation for NCPcompatCBDev.

This commit is contained in:
asofold 2018-04-17 12:07:47 +02:00
parent caf137da99
commit f6d00c3346
1 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
NCPCompatNonFree/NCPCompatCBDev/src/main/java/fr/neatmonster/nocheatplus/compat/cbdev/BlockCacheCBDev.java
View File

@ -28,42 +28,12 @@ import net.minecraft.server.v1_12_R1.AxisAlignedBB;
import net.minecraft.server.v1_12_R1.BlockPosition; import net.minecraft.server.v1_12_R1.BlockPosition;
import net.minecraft.server.v1_12_R1.EntityBoat; import net.minecraft.server.v1_12_R1.EntityBoat;
import net.minecraft.server.v1_12_R1.EntityShulker; import net.minecraft.server.v1_12_R1.EntityShulker;
import net.minecraft.server.v1_12_R1.EnumDirection;
import net.minecraft.server.v1_12_R1.IBlockAccess;
import net.minecraft.server.v1_12_R1.IBlockData;
import net.minecraft.server.v1_12_R1.TileEntity;
public class BlockCacheCBDev extends BlockCache { public class BlockCacheCBDev extends BlockCache {
protected net.minecraft.server.v1_12_R1.World world; protected net.minecraft.server.v1_12_R1.World world;
protected World bukkitWorld; protected World bukkitWorld;
private final IBlockAccess iBlockAccess = new IBlockAccess() {
@Override
public int getBlockPower(BlockPosition pos, EnumDirection dir) {
return world.getBlockPower(pos, dir);
}
@Override
public TileEntity getTileEntity(BlockPosition pos) {
return world.getTileEntity(pos);
}
@Override
public IBlockData getType(BlockPosition pos) {
// TODO: Can this be cached ?
return world.getType(pos);
}
@Override
public boolean isEmpty(BlockPosition pos) {
// TODO: Can (and should) this be cached ?
return world.isEmpty(pos);
}
};
public BlockCacheCBDev(World world) { public BlockCacheCBDev(World world) {
setAccess(world); setAccess(world);
} }
@ -104,7 +74,7 @@ public class BlockCacheCBDev extends BlockCache {
final BlockPosition pos = new BlockPosition(x, y, z); final BlockPosition pos = new BlockPosition(x, y, z);
// TODO: Deprecation warning below (reason / substitute?). // TODO: Deprecation warning below (reason / substitute?).
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
final AxisAlignedBB bb = block.b(iBlockAccess.getType(pos), iBlockAccess, pos); final AxisAlignedBB bb = block.b(world.getType(pos), world, pos);
if (bb == null) { if (bb == null) {
return new double[] {0.0, 0.0, 0.0, 1.0, 1.0, 1.0}; // Special case. return new double[] {0.0, 0.0, 0.0, 1.0, 1.0, 1.0}; // Special case.
//return null; //return null;