diff --git a/share/deob/map/client.yaml b/share/deob/map/client.yaml
index 895e645b..5af7e14f 100644
--- a/share/deob/map/client.yaml
+++ b/share/deob/map/client.yaml
@@ -4630,7 +4630,7 @@ fields:
     name: "roofsVisible"
   client!jo.I [I:
     owner: "PathFinder"
-    name: "anIntArray653"
+    name: "queueZ"
   client!jo.N Ljava/lang/String;:
     owner: "Text"
     name: "CHATCOL0"
@@ -8509,7 +8509,7 @@ fields:
     name: "anInt4461"
   client!re.h [I:
     owner: "PathFinder"
-    name: "anIntArray479"
+    name: "queueX"
   client!re.i I:
     owner: "Class150"
     name: "anInt4462"
@@ -14754,18 +14754,18 @@ methods:
     locals: {}
   client!ch.a (IIIIBIII)Z:
     owner: "CollisionMap"
-    name: "method574"
+    name: "isAtWall"
     arguments:
-      0: "arg0"
-      1: "arg1"
-      2: "arg2"
-      3: "arg3"
-      5: "arg4"
-      6: "arg5"
-      7: "arg6"
+      3: "x"
+      2: "z"
+      6: "size"
+      5: "destX"
+      0: "destZ"
+      7: "destType"
+      1: "destAngle"
     locals:
-      89: "local89"
-      95: "local95"
+      89: "x1"
+      95: "z1"
   client!ch.a (IIIII)Z:
     owner: "CollisionMap"
     name: "method575"
@@ -14785,59 +14785,59 @@ methods:
       246: "local246"
   client!ch.a (IIIIIIII)Z:
     owner: "CollisionMap"
-    name: "method577"
+    name: "isAtWallDecor"
     arguments:
-      0: "arg0"
-      1: "arg1"
-      2: "arg2"
-      4: "arg3"
-      5: "arg4"
-      6: "arg5"
-      7: "arg6"
+      1: "x"
+      4: "z"
+      7: "size"
+      0: "destX"
+      2: "destZ"
+      5: "destType"
+      6: "destAngle"
     locals:
-      89: "local89"
-      95: "local95"
+      89: "x1"
+      95: "z1"
   client!ch.a (IIIIIIIII)Z:
     owner: "CollisionMap"
-    name: "method570"
+    name: "isInsideOrOutsideRect"
     arguments:
-      0: "arg0"
-      2: "arg1"
-      3: "arg2"
-      4: "arg3"
-      5: "arg4"
-      6: "arg5"
-      7: "arg6"
-      8: "arg7"
-    locals:
-      39: "local39"
-      45: "local45"
+      8: "x"
+      0: "z"
+      3: "size"
+      5: "destX"
+      4: "destZ"
+      7: "destWidth"
+      6: "destLength"
+      2: "destBlockedSides"
+    locals:
+      39: "destZ1"
+      45: "destX1"
   client!ch.a (IIIIIIIIII)Z:
     owner: "CollisionMap"
-    name: "method578"
+    name: "isOutsideRect"
     arguments:
-      0: "arg0"
-      1: "arg1"
-      2: "arg2"
-      3: "arg3"
-      5: "arg4"
-      6: "arg5"
-      7: "arg6"
-      8: "arg7"
-      9: "arg8"
-    locals:
-      9: "local9"
-      13: "local13"
-      17: "local17"
-      22: "local22"
-      51: "local51"
-      62: "local62"
-      125: "local125"
-      136: "local136"
-      186: "local186"
-      197: "local197"
-      238: "local238"
-      245: "local245"
+      2: "x"
+      6: "z"
+      5: "width"
+      1: "length"
+      7: "destX"
+      9: "destZ"
+      3: "destWidth"
+      0: "destLength"
+      8: "destBlockedSides"
+    locals:
+      9: "x1"
+      13: "destX1"
+      17: "z1"
+      22: "destZ1"
+      51: "z0"
+      62: "zMax"
+      125: "x0"
+      136: "xMax"
+      186: "xMax"
+      197: "x0"
+      238: "z0"
+      245: "zMax"
   client!ch.a (IIIIZIIZ)V:
     owner: "CollisionMap"
     name: "method568"
@@ -18860,18 +18860,18 @@ methods:
       3: "arg2"
     locals: {}
   client!fg.a (IIIZIIIIBII)V:
-    owner: "Static15"
-    name: "method1337"
-    arguments:
-      0: "arg0"
-      1: "arg1"
-      2: "arg2"
-      4: "arg3"
-      5: "arg4"
-      6: "arg5"
-      7: "arg6"
-      9: "arg7"
-      10: "arg8"
+    owner: "PathFinder"
+    name: "findPath"
+    arguments:
+      0: "srcX"
+      6: "srcZ"
+      10: "destX"
+      5: "destZ"
+      7: "destType"
+      4: "destWidth"
+      9: "destLength"
+      1: "destAngle"
+      2: "destBlockedSides"
     locals: {}
   client!fg.e (I)V:
     owner: "Equipment"
@@ -23980,44 +23980,44 @@ methods:
       6: "local6"
   client!jc.a (IIIIIIIIIIIZ)V:
     owner: "PathFinder"
-    name: "method1998"
-    arguments:
-      0: "arg0"
-      1: "arg1"
-      2: "arg2"
-      3: "arg3"
-      4: "arg4"
-      6: "arg5"
-      7: "arg6"
-      8: "arg7"
-      9: "arg8"
-      10: "arg9"
-    locals:
-      7: "local7"
-      12: "local12"
-      51: "local51"
-      53: "local53"
-      55: "local55"
-      62: "local62"
-      66: "local66"
-      68: "local68"
-      73: "local73"
-      200: "local200"
-      244: "local244"
-      351: "local351"
-      456: "local456"
-      561: "local561"
-      655: "local655"
-      767: "local767"
-      877: "local877"
-      990: "local990"
-      1081: "local1081"
-      1083: "local1083"
-      1090: "local1090"
-      1100: "local1100"
-      1129: "local1129"
-      1164: "local1164"
-      1208: "local1208"
+    name: "findPathN"
+    arguments:
+      2: "srcX"
+      4: "srcZ"
+      9: "size"
+      1: "destX"
+      7: "destZ"
+      0: "destType"
+      3: "destWidth"
+      6: "destLength"
+      10: "destAngle"
+      8: "destBlockedSides"
+    locals:
+      7: "x"
+      12: "z"
+      51: "x"
+      53: "z"
+      55: "firstWriterIndex"
+      62: "queueWriterIndex"
+      66: "queueReaderIndex"
+      68: "found"
+      73: "flags"
+      200: "cost"
+      244: "off"
+      351: "off"
+      456: "off"
+      561: "off"
+      655: "off"
+      767: "off"
+      877: "off"
+      990: "off"
+      1081: "bestDistance"
+      1083: "bestCost"
+      1090: "x0"
+      1100: "z0"
+      1129: "dx"
+      1164: "dz"
+      1208: "distance"
   client!jc.a (Lclient!fd;I)V:
     owner: "ParamType"
     name: "decode"
@@ -25718,35 +25718,35 @@ methods:
       38: "local38"
   client!ka.a (ZIIIIIIIIII)V:
     owner: "PathFinder"
-    name: "method2197"
-    arguments:
-      1: "arg0"
-      2: "arg1"
-      3: "arg2"
-      4: "arg3"
-      5: "arg4"
-      6: "arg5"
-      7: "arg6"
-      8: "arg7"
-      10: "arg8"
-    locals:
-      7: "local7"
-      14: "local14"
-      37: "local37"
-      39: "local39"
-      41: "local41"
-      49: "local49"
-      62: "local62"
-      66: "local66"
-      71: "local71"
-      192: "local192"
-      805: "local805"
-      809: "local809"
-      814: "local814"
-      827: "local827"
-      858: "local858"
-      889: "local889"
-      930: "local930"
+    name: "findPath1"
+    arguments:
+      7: "srcX"
+      1: "srcZ"
+      2: "destX"
+      5: "destZ"
+      6: "destType"
+      10: "destWidth"
+      3: "destLength"
+      4: "destAngle"
+      8: "destBlockedSides"
+    locals:
+      7: "x"
+      14: "z"
+      37: "x"
+      39: "z"
+      41: "firstWriterIndex"
+      49: "queueReaderIndex"
+      62: "queueWriterIndex"
+      66: "found"
+      71: "flags"
+      192: "cost"
+      805: "bestDistance"
+      809: "bestCost"
+      814: "x0"
+      827: "z0"
+      858: "dx"
+      889: "dz"
+      930: "distance"
   client!kb.a ()I:
     owner: "JavaAudioChannel"
     name: "getBufferedSampleCount"
@@ -36626,35 +36626,35 @@ methods:
       11: "texture"
   client!qi.a (IIIIIZIIIII)V:
     owner: "PathFinder"
-    name: "method418"
-    arguments:
-      0: "arg0"
-      1: "arg1"
-      2: "arg2"
-      3: "arg3"
-      4: "arg4"
-      6: "arg5"
-      8: "arg6"
-      9: "arg7"
-      10: "arg8"
-    locals:
-      7: "local7"
-      12: "local12"
-      37: "local37"
-      51: "local51"
-      53: "local53"
-      55: "local55"
-      57: "local57"
-      64: "local64"
-      77: "local77"
-      201: "local201"
-      920: "local920"
-      922: "local922"
-      928: "local928"
-      938: "local938"
-      970: "local970"
-      972: "local972"
-      1049: "local1049"
+    name: "findPath2"
+    arguments:
+      4: "srcX"
+      2: "srcZ"
+      0: "destX"
+      6: "destZ"
+      3: "destType"
+      1: "destWidth"
+      10: "destLength"
+      8: "destAngle"
+      9: "destBlockedSides"
+    locals:
+      7: "x"
+      12: "z"
+      37: "z"
+      51: "x"
+      53: "queueReaderIndex"
+      55: "firstWriterIndex"
+      57: "found"
+      64: "queueWriterIndex"
+      77: "flags"
+      201: "cost"
+      920: "bestDistance"
+      922: "bestCost"
+      928: "x0"
+      938: "z0"
+      970: "dx"
+      972: "dz"
+      1049: "distance"
   client!qi.a (IJ)Ljava/lang/String;:
     owner: "Static30"
     name: "method423"
@@ -43667,17 +43667,17 @@ methods:
     arguments: {}
     locals: {}
   client!ve.a (IIIIIIIII)Z:
-    owner: "Static36"
-    name: "method4440"
+    owner: "CollisionMap"
+    name: "isInsideRect"
     arguments:
-      0: "arg0"
-      1: "arg1"
-      2: "arg2"
-      3: "arg3"
-      4: "arg4"
-      5: "arg5"
-      7: "arg6"
-      8: "arg7"
+      7: "x"
+      0: "z"
+      8: "width"
+      3: "length"
+      1: "destX"
+      4: "destZ"
+      5: "destWidth"
+      2: "destLength"
     locals: {}
   client!ve.b (I)Z:
     owner: "Protocol"