Add sneak metadata

CitizensDev · Sep 20, 2021 · 81a4ad5 · 81a4ad5
1 parent 3a745f3
commit 81a4ad5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/main/java/net/citizensnpcs/api/astar/pathfinder/MinecraftBlockExaminer.java b/src/main/java/net/citizensnpcs/api/astar/pathfinder/MinecraftBlockExaminer.java
@@ -87,28 +87,33 @@ public void run(final NPC npc, Block point, ListIterator<Block> path) {
                 added = true;
                 return;
             }
-            Runnable callback = new Runnable() {
+            npc.getNavigator().getLocalParameters().addRunCallback(new Runnable() {
                 Location dummy = new Location(null, 0, 0, 0);
+                boolean sneakingForScaffolding;
 
                 @Override
                 public void run() {
                     Material type = npc.getEntity().getLocation(dummy).getBlock().getType();
                     if (isClimbable(type)) {
                         if (current.next().getY() > current.previous().getY()) {
                             npc.getEntity().setVelocity(npc.getEntity().getVelocity().setY(0.3));
+                            if (sneakingForScaffolding) {
+                                npc.data().set(NPC.SNEAKING_METADATA, sneakingForScaffolding = false);
+                            }
                         } else if (type.name().equals("SCAFFOLDING")) {
-                            npc.getEntity().setVelocity(npc.getEntity().getVelocity().setY(-0.3));
+                            npc.data().set(NPC.SNEAKING_METADATA, sneakingForScaffolding = true);
                         }
+                    } else if (sneakingForScaffolding) {
+                        npc.data().set(NPC.SNEAKING_METADATA, sneakingForScaffolding = false);
                     }
                 }
-            };
+            });
             npc.getNavigator().getLocalParameters().addSingleUseCallback(new NavigatorCallback() {
                 @Override
                 public void onCompletion(CancelReason cancelReason) {
                     npc.data().set("running-ladder", false);
                 }
             });
-            npc.getNavigator().getLocalParameters().addRunCallback(callback);
             added = true;
         }
     }

diff --git a/src/main/java/net/citizensnpcs/api/npc/NPC.java b/src/main/java/net/citizensnpcs/api/npc/NPC.java
@@ -464,6 +464,10 @@ public interface NPC extends Agent, Cloneable {
      * Whether to suppress sounds. Boolean.
      */
     public static final String SILENT_METADATA = "silent-sounds";
+    /**
+     * Whether to sneak. Boolean.
+     */
+    public static final String SNEAKING_METADATA = "citizens-sneaking";
     /**
      * Whether to allow swimming. Boolean.
      */