PHP7.4-Compatibility: Map::sendPacketRange() putting optional parameter after the required one

mchekin · mchekin · commit e150ec3bf819 · 2021-03-13T12:36:18.000+01:00
diff --git a/core/map.core.php b/core/map.core.php
@@ -701,7 +701,7 @@ public static function getBySerial($serial = false) {
     /**
      * Send desired packet to a range of players around the client
      */
-    public static function sendPacketRange($packet = null, $client) {
+    public static function sendPacketRange($client, $packet = null) {
         if ($packet === null) {
             return false;
         }
diff --git a/core/player.class.php b/core/player.class.php
@@ -1154,7 +1154,7 @@ public function speech($type, $color, $font, $language, $text) {
             $packet .= $tmpPacket;
             $packet .= "0000";
 
-            Map::sendPacketRange($packet, $this->client);
+            Map::sendPacketRange($this->client, $packet);
             Map::sendHearMessage($this->client, $text);
         }
         Sockets::out($this->client, $packet, false);

Original file line number	Diff line number	Diff line change
`@@ -701,7 +701,7 @@ public static function getBySerial($serial = false) {`
`701`	`701`	`/**`
`702`	`702`	`* Send desired packet to a range of players around the client`
`703`	`703`	`*/`
`704`		`- public static function sendPacketRange($packet = null, $client) {`
	`704`	`+ public static function sendPacketRange($client, $packet = null) {`
`705`	`705`	`if ($packet === null) {`
`706`	`706`	`return false;`
`707`	`707`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1154,7 +1154,7 @@ public function speech($type, $color, $font, $language, $text) {`
`1154`	`1154`	`$packet .= $tmpPacket;`
`1155`	`1155`	`$packet .= "0000";`
`1156`	`1156`
`1157`		`- Map::sendPacketRange($packet, $this->client);`
	`1157`	`+ Map::sendPacketRange($this->client, $packet);`
`1158`	`1158`	`Map::sendHearMessage($this->client, $text);`
`1159`	`1159`	`}`
`1160`	`1160`	`Sockets::out($this->client, $packet, false);`