Fixed merge error

This commit is contained in:
Dylan K. Taylor 2018-07-17 18:46:27 +01:00
parent df3870a112
commit bc9a387b0b
2 changed files with 4 additions and 4 deletions

View File

@ -66,7 +66,7 @@ class MoveEntityDeltaPacket extends DataPacket{
return 0.0;
}
protected function decodePayload(){
protected function decodePayload() : void{
$this->flags = $this->getByte();
$this->xDiff = $this->maybeReadCoord(self::FLAG_HAS_X);
$this->yDiff = $this->maybeReadCoord(self::FLAG_HAS_Y);
@ -88,7 +88,7 @@ class MoveEntityDeltaPacket extends DataPacket{
}
}
protected function encodePayload(){
protected function encodePayload() : void{
$this->putByte($this->flags);
$this->maybeWriteCoord(self::FLAG_HAS_X, $this->xDiff);
$this->maybeWriteCoord(self::FLAG_HAS_Y, $this->yDiff);

View File

@ -33,11 +33,11 @@ class SetLocalPlayerAsInitializedPacket extends DataPacket{
/** @var int */
public $entityRuntimeId;
protected function decodePayload(){
protected function decodePayload() : void{
$this->entityRuntimeId = $this->getEntityRuntimeId();
}
protected function encodePayload(){
protected function encodePayload() : void{
$this->putEntityRuntimeId($this->entityRuntimeId);
}