Merge branch 'develop' into blacktek-toml

system/pages/highscores.php

@@ -207,10 +207,14 @@ if (empty($highscores)) {
 	}
 
 	$highscores = $query->get()->map(function($row) {
+		/**
+	 	* @var Player $row
+	 	*/
 		$tmp = $row->toArray();
 		$tmp['online'] = $row->online_status;
 		$tmp['vocation'] = $row->vocation_name;
-		$tmp['outfit_url'] = $row->outfit_url; // @phpstan-ignore-line
+		$tmp['outfit_url'] = $row->outfit_url;
+		$tmp['link'] = getPlayerLink($row->name, false);
 		unset($tmp['online_table']);
 
 		return $tmp;
@@ -244,7 +248,6 @@ foreach($highscores as $id => &$player)
 			$player['experience'] = number_format($player['experience']);
 		}
 
-		$player['link'] = getPlayerLink($player['name'], false);
 		$player['flag'] = getFlagImage($player['country']);
 		$player['outfit'] = '<img style="position:absolute;margin-top:-50px;margin-left:-30px" src="' . $player['outfit_url'] . '" alt="" />';
 

system/src/Models/Player.php

@@ -5,6 +5,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 
 /**
+ * @property string $name
  * @property int $level
  * @property int $vocation
  * @property int $online
@@ -14,6 +15,9 @@ use Illuminate\Database\Eloquent\Relations\HasOne;
  * @property int $looklegs
  * @property int $lookfeet
  * @property int $lookaddons
+ * @property int $promotion
+ * @property bool $online_status
+ * @property string $vocation_name
  * @property string $outfit_url
  * @property hasOne $onlineTable
  */

system/src/Plugins.php

@@ -890,7 +890,11 @@ class Plugins {
 
 		global $hooks;
 		foreach($plugin_info['hooks'] ?? [] as $name => $info) {
-			$hooks->unregister($name, $info['type'], $info['file']);
+			if (str_contains($info['type'], 'HOOK_')) {
+				$info['type'] = str_replace('HOOK_', '', $info['type']);
+			}
+
+			$hooks->unregister($name, 'HOOK_' . $info['type'], $info['file']);
 		}
 
 		clearCache();