mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-05-14 09:49:50 +00:00
Merge commit '84f99ed41'
# Conflicts: # resources/vanilla
This commit is contained in:
commit
73495f303e
@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -48,5 +48,5 @@ class CommandOriginData{
|
|||||||
public $requestId;
|
public $requestId;
|
||||||
|
|
||||||
/** @var int */
|
/** @var int */
|
||||||
public $varlong1;
|
public $playerEntityUniqueId;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user