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

PacketSerializer: fix merge error

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-04-11 16:49:57 +01:00
parent 74d103a56f
commit 66622defae
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/mcpe/protocol/serializer/PacketSerializer.php
View File

@ -287,7 +287,7 @@ class PacketSerializer extends BinaryStream{
} }
if(!$extraData->feof()){ if(!$extraData->feof()){
throw new PacketDecodeException("Unexpected trailing extradata for network item $netId"); throw new PacketDecodeException("Unexpected trailing extradata for network item $id");
} }
return new ItemStack($id, $meta, $count, $blockRuntimeId, $compound, $canPlaceOn, $canDestroy, $shieldBlockingTick); return new ItemStack($id, $meta, $count, $blockRuntimeId, $compound, $canPlaceOn, $canDestroy, $shieldBlockingTick);