Merge remote-tracking branch 'origin/stable'

This commit is contained in:
Dylan K. Taylor
2021-07-23 16:40:19 +01:00
8 changed files with 221 additions and 27 deletions

View File

@@ -605,6 +605,7 @@ class NetworkSession{
$myXUID = $this->info instanceof XboxLivePlayerInfo ? $this->info->getXuid() : "";
$kickForXUIDMismatch = function(string $xuid) use ($checkXUID, $myXUID) : bool{
if($checkXUID && $myXUID !== $xuid){
$this->logger->debug("XUID mismatch: expected '$xuid', but got '$myXUID'");
//TODO: Longer term, we should be identifying playerdata using something more reliable, like XUID or UUID.
//However, that would be a very disruptive change, so this will serve as a stopgap for now.
//Side note: this will also prevent offline players hijacking XBL playerdata on online servers, since their