Merge commit '84f99ed41'

# Conflicts:
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor 2020-05-20 20:10:30 +01:00
commit 73495f303e
2 changed files with 3 additions and 3 deletions

View File

@ -623,7 +623,7 @@ class NetworkBinaryStream extends BinaryStream{
$result->requestId = $this->getString(); $result->requestId = $this->getString();
if($result->type === CommandOriginData::ORIGIN_DEV_CONSOLE or $result->type === CommandOriginData::ORIGIN_TEST){ if($result->type === CommandOriginData::ORIGIN_DEV_CONSOLE or $result->type === CommandOriginData::ORIGIN_TEST){
$result->varlong1 = $this->getVarLong(); $result->playerEntityUniqueId = $this->getVarLong();
} }
return $result; return $result;
@ -635,7 +635,7 @@ class NetworkBinaryStream extends BinaryStream{
$this->putString($data->requestId); $this->putString($data->requestId);
if($data->type === CommandOriginData::ORIGIN_DEV_CONSOLE or $data->type === CommandOriginData::ORIGIN_TEST){ if($data->type === CommandOriginData::ORIGIN_DEV_CONSOLE or $data->type === CommandOriginData::ORIGIN_TEST){
$this->putVarLong($data->varlong1); $this->putVarLong($data->playerEntityUniqueId);
} }
} }

View File

@ -48,5 +48,5 @@ class CommandOriginData{
public $requestId; public $requestId;
/** @var int */ /** @var int */
public $varlong1; public $playerEntityUniqueId;
} }