From c0216709a3411f0c12c05e9b7f13811bd169cabc Mon Sep 17 00:00:00 2001 From: fullwall Date: Sun, 22 Mar 2020 14:44:55 +0800 Subject: [PATCH] All blocks outside 0-255 should be AIR --- .../api/astar/pathfinder/MinecraftBlockExaminer.java | 3 +++ src/main/java/net/citizensnpcs/api/command/CommandManager.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/citizensnpcs/api/astar/pathfinder/MinecraftBlockExaminer.java b/src/main/java/net/citizensnpcs/api/astar/pathfinder/MinecraftBlockExaminer.java index 62325b43..f7ec62f4 100644 --- a/src/main/java/net/citizensnpcs/api/astar/pathfinder/MinecraftBlockExaminer.java +++ b/src/main/java/net/citizensnpcs/api/astar/pathfinder/MinecraftBlockExaminer.java @@ -41,6 +41,9 @@ private boolean isClimbable(Material mat) { @Override public PassableState isPassable(BlockSource source, PathPoint point) { Vector pos = point.getVector(); + if (pos.getBlockY() <= 0 || pos.getBlockY() >= 255) { + return PassableState.UNPASSABLE; + } Material above = source.getMaterialAt(pos.clone().add(UP)); Material below = source.getMaterialAt(pos.clone().add(DOWN)); Material in = source.getMaterialAt(pos); diff --git a/src/main/java/net/citizensnpcs/api/command/CommandManager.java b/src/main/java/net/citizensnpcs/api/command/CommandManager.java index 6c8b2dbd..f9076514 100644 --- a/src/main/java/net/citizensnpcs/api/command/CommandManager.java +++ b/src/main/java/net/citizensnpcs/api/command/CommandManager.java @@ -440,8 +440,9 @@ private void registerMethods(Class clazz, Method parent, Object obj) { List annotations = Lists.newArrayList(); for (Annotation annotation : method.getDeclaringClass().getAnnotations()) { Class annotationClass = annotation.annotationType(); - if (annotationProcessors.containsKey(annotationClass)) + if (annotationProcessors.containsKey(annotationClass)) { annotations.add(annotation); + } } for (Annotation annotation : method.getAnnotations()) { Class annotationClass = annotation.annotationType();