mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-12 00:39:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.5'

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-01-03 17:29:53 +00:00
commit 9840a3c980
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pocketmine/network/mcpe/protocol/AddEntityPacket.php
View File

@ -169,7 +169,7 @@ class AddEntityPacket extends DataPacket{
protected function decodePayload() : void{ protected function decodePayload() : void{
$this->entityUniqueId = $this->getEntityUniqueId(); $this->entityUniqueId = $this->getEntityUniqueId();
$this->entityRuntimeId = $this->getEntityRuntimeId(); $this->entityRuntimeId = $this->getEntityRuntimeId();
$this->type = array_search($t = $this->getString(), self::LEGACY_ID_MAP_BC); $this->type = array_search($t = $this->getString(), self::LEGACY_ID_MAP_BC, true);
if($this->type === false){ if($this->type === false){
throw new \UnexpectedValueException("Can't map ID $t to legacy ID"); throw new \UnexpectedValueException("Can't map ID $t to legacy ID");
} }
@ -207,6 +207,9 @@ class AddEntityPacket extends DataPacket{
protected function encodePayload() : void{ protected function encodePayload() : void{
$this->putEntityUniqueId($this->entityUniqueId ?? $this->entityRuntimeId); $this->putEntityUniqueId($this->entityUniqueId ?? $this->entityRuntimeId);
$this->putEntityRuntimeId($this->entityRuntimeId); $this->putEntityRuntimeId($this->entityRuntimeId);
if(!isset(self::LEGACY_ID_MAP_BC[$this->type])){
throw new \InvalidArgumentException("Unknown entity numeric ID $this->type");
}
$this->putString(self::LEGACY_ID_MAP_BC[$this->type]); $this->putString(self::LEGACY_ID_MAP_BC[$this->type]);
$this->putVector3($this->position); $this->putVector3($this->position);
$this->putVector3Nullable($this->motion); $this->putVector3Nullable($this->motion);