PHP7.4-Compatibility: FlowPath::getNodeFrom() putting optional parameter after the required one

mchekin · mchekin · commit d30aed0f1233 · 2021-03-13T12:26:45.000+01:00
diff --git a/core/AI/pathfind.ai.php b/core/AI/pathfind.ai.php
@@ -105,7 +105,7 @@ private function getBestDirection($from = [], $direction = 0, $checkFlow = false
 
     public function canGoTo($from = [], $direction = 0, $checkFlow = false, $step = null) {
         if (!$checkFlow) {
-            if ($this->getNodeFrom($from, $direction) === FlowPath::TYPE_WALL) {
+            if ($this->getNodeFrom($direction, $from) === FlowPath::TYPE_WALL) {
                 return false;
             }
             return true;
@@ -422,7 +422,7 @@ public function getDestination() {
         }
     }
 
-    public function getNodeFrom($from = [], $direction) {
+    public function getNodeFrom($direction, $from = []) {
         switch ($direction) {
             case self::DIR_NORTH:
                 if (!isset($this->map[($from[1] - 1)]) || !isset($this->map[($from[1] - 1)][($from[0])])) {
@@ -509,14 +509,14 @@ public function getNodeFrom($from = [], $direction) {
 
     public function getAroundNodes($from = []) {
         return [
-            self::DIR_NORTH     => [0 => ($from[0]), 1 => ($from[1] - 1), 3 => $this->getNodeFrom($from, self::DIR_NORTH)],
-            self::DIR_NORTHEAST => [0 => ($from[0] + 1), 1 => ($from[1] - 1), 3 => $this->getNodeFrom($from, self::DIR_NORTHEAST)],
-            self::DIR_EAST      => [0 => ($from[0] + 1), 1 => ($from[1]), 3 => $this->getNodeFrom($from, self::DIR_EAST)],
-            self::DIR_SOUTHEAST => [0 => ($from[0] + 1), 1 => ($from[1] + 1), 3 => $this->getNodeFrom($from, self::DIR_SOUTHEAST)],
-            self::DIR_SOUTH     => [0 => ($from[0]), 1 => ($from[1] + 1), 3 => $this->getNodeFrom($from, self::DIR_SOUTH)],
-            self::DIR_SOUTHWEST => [0 => ($from[0] - 1), 1 => ($from[1] + 1), 3 => $this->getNodeFrom($from, self::DIR_SOUTHWEST)],
-            self::DIR_WEST      => [0 => ($from[0] - 1), 1 => ($from[1]), 3 => $this->getNodeFrom($from, self::DIR_WEST)],
-            self::DIR_NORTHWEST => [0 => ($from[0] - 1), 1 => ($from[1] - 1), 3 => $this->getNodeFrom($from, self::DIR_NORTHWEST)],
+            self::DIR_NORTH     => [0 => ($from[0]), 1 => ($from[1] - 1), 3 => $this->getNodeFrom(self::DIR_NORTH, $from)],
+            self::DIR_NORTHEAST => [0 => ($from[0] + 1), 1 => ($from[1] - 1), 3 => $this->getNodeFrom(self::DIR_NORTHEAST), $from],
+            self::DIR_EAST      => [0 => ($from[0] + 1), 1 => ($from[1]), 3 => $this->getNodeFrom(self::DIR_EAST), $from],
+            self::DIR_SOUTHEAST => [0 => ($from[0] + 1), 1 => ($from[1] + 1), 3 => $this->getNodeFrom( self::DIR_SOUTHEAST), $from],
+            self::DIR_SOUTH     => [0 => ($from[0]), 1 => ($from[1] + 1), 3 => $this->getNodeFrom(self::DIR_SOUTH), $from],
+            self::DIR_SOUTHWEST => [0 => ($from[0] - 1), 1 => ($from[1] + 1), 3 => $this->getNodeFrom(self::DIR_SOUTHWEST), $from],
+            self::DIR_WEST      => [0 => ($from[0] - 1), 1 => ($from[1]), 3 => $this->getNodeFrom(self::DIR_WEST), $from],
+            self::DIR_NORTHWEST => [0 => ($from[0] - 1), 1 => ($from[1] - 1), 3 => $this->getNodeFrom(self::DIR_NORTHWEST), $from],
         ];
     }
 
