fix a bug and some warnings

jacob-grahn · jacob-grahn · commit b4cfd5fa68c6 · 2024-09-22T04:18:41.000-04:00
diff --git a/multiplayer_server/CourseBox.php b/multiplayer_server/CourseBox.php
@@ -237,11 +237,11 @@ public function remove($fromE = false, $fromGame = false)
             $this->clearSlot($player, true);
         }
 
-        $this->slot_array = null;
         unset($this->slot_array);
 
-        $this->room->course_array[$course_id] = null;
-        unset($this->room->course_array[$course_id]);
+        if (!empty($room)) {
+            unset($this->room->course_array[$course_id]);
+        }
 
         if (!empty($room) && $fromE === false) {
             $room->maybeHighlight('remove', $page_number);
diff --git a/multiplayer_server/PR2Client.php b/multiplayer_server/PR2Client.php
@@ -16,6 +16,7 @@ class PR2Client extends \chabot\SocketServerClient
     public $process = false;
     public $ip;
     public $id;
+    public $player;
 
     public function __construct($socket)
     {
diff --git a/multiplayer_server/Player.php b/multiplayer_server/Player.php
@@ -106,6 +106,10 @@ class Player
     public $super_booster = false;
     public $last_save_time = 0;
 
+    public $average_vel_x = 0;
+    public $average_vel_y = 0;
+    public $race_stats = null;
+
 
     public function __construct($socket, $login)
     {

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ class PR2Client extends \chabot\SocketServerClient`
`16`	`16`	`public $process = false;`
`17`	`17`	`public $ip;`
`18`	`18`	`public $id;`
	`19`	`+ public $player;`
`19`	`20`
`20`	`21`	`public function __construct($socket)`
`21`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,10 @@ class Player`
`106`	`106`	`public $super_booster = false;`
`107`	`107`	`public $last_save_time = 0;`
`108`	`108`
	`109`	`+ public $average_vel_x = 0;`
	`110`	`+ public $average_vel_y = 0;`
	`111`	`+ public $race_stats = null;`
	`112`	`+`
`109`	`113`
`110`	`114`	`public function __construct($socket, $login)`
`111`	`115`	`{`