Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-11-07 11:10:05 +01:00
Code Issues Projects Releases Wiki Activity

Extend pre-setup checks for dedicated MCAccess for 1.9.

Browse Source
This commit is contained in:
asofold 2016-03-05 20:06:20 +01:00
parent e58b334911
commit 4221f5bf18
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,7 @@ public class BlockCacheCBDev extends BlockCache implements IBlockAccess{
return null;
}
final BlockPosition pos = new BlockPosition(x, y, z);
final IBlockData data = block.updateState(getType(pos), this, pos);
final IBlockData data = block.updateState(getType(pos), this, pos); // TODO: updateState still needed?
final AxisAlignedBB bb = block.a(data, this, pos);
if (bb == null) {

28
NCPCompatCBDev/src/main/java/fr/neatmonster/nocheatplus/compat/cbdev/MCAccessCBDev.java
View File

@ -4,10 +4,13 @@ import net.minecraft.server.v1_9_R1.AttributeInstance;
import net.minecraft.server.v1_9_R1.AttributeModifier;
import net.minecraft.server.v1_9_R1.AxisAlignedBB;
import net.minecraft.server.v1_9_R1.Block;
import net.minecraft.server.v1_9_R1.BlockPosition;
import net.minecraft.server.v1_9_R1.DamageSource;
import net.minecraft.server.v1_9_R1.EntityComplexPart;
import net.minecraft.server.v1_9_R1.EntityPlayer;
import net.minecraft.server.v1_9_R1.GenericAttributes;
import net.minecraft.server.v1_9_R1.IBlockAccess;
import net.minecraft.server.v1_9_R1.IBlockData;
import net.minecraft.server.v1_9_R1.MobEffectList;
import org.bukkit.Bukkit;
@ -38,16 +41,17 @@ public class MCAccessCBDev implements MCAccess {
*/
public MCAccessCBDev() {
// try {
// TODO: AxisAlignedBB abcdef
// TODO: BlockPosition
// TODO: IBlockData
// TODO: Block... used in BlockCache.
getCommandMap();
ReflectionUtil.checkMembers("net.minecraft.server.v1_9_R1.",
new String[] {"Entity" , "length", "width", "locY"});
ReflectionUtil.checkMembers("net.minecraft.server.v1_9_R1.",
new String[] {"EntityPlayer" , "dead", "deathTicks", "invulnerableTicks"});
// block bounds, original: minX, maxX, minY, maxY, minZ, maxZ
if (ReflectionUtil.getMethod(Block.class, "updateState", IBlockData.class, IBlockAccess.class, BlockPosition.class).getReturnType() != IBlockData.class) {
// TODO: Check if still needed.
throw new RuntimeException();
}
if (ReflectionUtil.getMethod(Block.class, "a", IBlockData.class, IBlockAccess.class, BlockPosition.class).getReturnType() != AxisAlignedBB.class) {
throw new RuntimeException();
}
if (ReflectionUtil.getConstructor(BlockPosition.class, int.class, int.class, int.class) == null) {
throw new RuntimeException();
}
ReflectionUtil.checkMethodReturnTypesNoArgs(net.minecraft.server.v1_9_R1.EntityLiving.class,
new String[]{"getHeadHeight"}, float.class);
ReflectionUtil.checkMethodReturnTypesNoArgs(net.minecraft.server.v1_9_R1.EntityPlayer.class,
@ -62,6 +66,12 @@ public class MCAccessCBDev implements MCAccess {
new String[]{"d"}, double.class);
ReflectionUtil.checkMethodReturnTypesNoArgs(net.minecraft.server.v1_9_R1.Material.class,
new String[]{"isSolid", "isLiquid"}, boolean.class);
// TODO: Confine the following by types as well.
ReflectionUtil.checkMembers("net.minecraft.server.v1_9_R1.",
new String[] {"Entity" , "length", "width", "locY"});
ReflectionUtil.checkMembers("net.minecraft.server.v1_9_R1.",
new String[] {"EntityPlayer" , "dead", "deathTicks", "invulnerableTicks"});
// obc: getHandle() for CraftWorld, CraftPlayer, CraftEntity.
// nms: Several: AxisAlignedBB, WorldServer
// nms: Block.getById(int), BlockPosition(int, int, int), WorldServer.getEntities(Entity, AxisAlignedBB)