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

Fix pre-checks for getHeight, use fail() rather.

Browse Source
This commit is contained in:
asofold 2016-11-22 21:04:59 +01:00
parent bf32406435
commit ba5f710c83
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
NCPCompatBukkit/src/main/java/fr/neatmonster/nocheatplus/compat/cbreflect/reflect/ReflectHelper.java
View File

@ -157,7 +157,8 @@ public class ReflectHelper {
} }
/** /**
* Quick fail with exception. * Quick fail with exception. Used both for setup and runtime.
* @throws ReflectFailureException Always.
*/ */
private void fail() { private void fail() {
throw new ReflectFailureException(); throw new ReflectFailureException();
@ -357,14 +358,15 @@ public class ReflectHelper {
public double getWidth(final Entity entity) { public double getWidth(final Entity entity) {
float width = -16f; float width = -16f;
if (reflectEntity.nmsWidth != null) { if (reflectEntity.nmsWidth == null) {
final Object handle = reflectEntity.getHandle(entity); fail();
if (handle != null) { }
width = ReflectionUtil.getFloat(reflectEntity.nmsWidth, handle, width); final Object handle = reflectEntity.getHandle(entity);
} if (handle != null) {
width = ReflectionUtil.getFloat(reflectEntity.nmsWidth, handle, width);
} }
if (width < 0f) { if (width < 0f) {
throw new ReflectFailureException(); fail();
} }
return (double) width; return (double) width;
} }
@ -372,15 +374,17 @@ public class ReflectHelper {
public double getHeight(final Entity entity) { public double getHeight(final Entity entity) {
float floatHeight = -16f; float floatHeight = -16f;
final Object handle = reflectEntity.getHandle(entity); // TODO: Distinguish classes (living vs not)? final Object handle = reflectEntity.getHandle(entity); // TODO: Distinguish classes (living vs not)?
if (handle != null) { double height;
if (reflectEntity.nmsLength != null) { if (handle == null) {
floatHeight = Math.max(ReflectionUtil.getFloat(reflectEntity.nmsLength, handle, floatHeight), floatHeight); fail();
}
if (reflectEntity.nmsHeight != null) {
floatHeight = Math.max(ReflectionUtil.getFloat(reflectEntity.nmsHeight, handle, floatHeight), floatHeight);
}
} }
double height = (double) floatHeight; if (reflectEntity.nmsLength != null) {
floatHeight = Math.max(ReflectionUtil.getFloat(reflectEntity.nmsLength, handle, floatHeight), floatHeight);
}
if (reflectEntity.nmsHeight != null) {
floatHeight = Math.max(ReflectionUtil.getFloat(reflectEntity.nmsHeight, handle, floatHeight), floatHeight);
}
height = (double) floatHeight;
// TODO: Consider dropping the box for performance? // TODO: Consider dropping the box for performance?
if (reflectAxisAlignedBB != null && reflectEntity.nmsGetBoundingBox != null) { if (reflectAxisAlignedBB != null && reflectEntity.nmsGetBoundingBox != null) {
final Object box = ReflectionUtil.invokeMethodNoArgs(reflectEntity.nmsGetBoundingBox, handle); final Object box = ReflectionUtil.invokeMethodNoArgs(reflectEntity.nmsGetBoundingBox, handle);
@ -394,7 +398,7 @@ public class ReflectHelper {
} }
} }
if (height < 0.0) { if (height < 0.0) {
throw new ReflectFailureException(); fail();
} }
// On success only: Check eye height (MCAccessBukkit is better than just eye height.). // On success only: Check eye height (MCAccessBukkit is better than just eye height.).
if (entity instanceof LivingEntity) { if (entity instanceof LivingEntity) {