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

Merge remote-tracking branch 'origin/minor-next' into major-next

Browse Source
This commit is contained in:
Dylan K. Taylor
2023-04-20 00:18:19 +01:00
parent 4147d0dc75 71b78b02d3
commit c878bd8289
6 changed files with 51 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/mcpe/NetworkSession.php
View File

@@ -114,9 +114,11 @@ use function base64_encode;
use function bin2hex;
use function count;
use function get_class;
use function implode;
use function in_array;
use function json_encode;
use function random_bytes;
use function str_split;
use function strcasecmp;
use function strlen;
use function strtolower;
@@ -648,7 +650,7 @@ class NetworkSession{
}
public function disconnectWithError(Translatable|string $reason) : void{
$this->disconnect(KnownTranslationFactory::pocketmine_disconnect_error($reason, bin2hex(random_bytes(6))));
$this->disconnect(KnownTranslationFactory::pocketmine_disconnect_error($reason, implode("-", str_split(bin2hex(random_bytes(6)), 4))));
}
public function disconnectIncompatibleProtocol(int $protocolVersion) : void{

8
src/network/mcpe/convert/TypeConverter.php
View File

@@ -173,9 +173,11 @@ class TypeConverter{
if($itemStack->isNull()){
return ItemStack::null();
}
$nbt = null;
if($itemStack->hasNamedTag()){
$nbt = clone $itemStack->getNamedTag();
$nbt = $itemStack->getNamedTag();
if($nbt->count() === 0){
$nbt = null;
}else{
$nbt = clone $nbt;
}
$idMeta = ItemTranslator::getInstance()->toNetworkIdQuiet($itemStack);