Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
"adhocore/json-comment": "~1.2.0",
"netresearch/jsonmapper": "~v5.0.0",
"pocketmine/bedrock-block-upgrade-schema": "~5.2.0+bedrock-1.21.110",
"pocketmine/bedrock-data": "~6.6.0+bedrock-1.26.20",
"pocketmine/bedrock-data": "dev-bedrock-1.26.30 as 6.7.0",
"pocketmine/bedrock-item-upgrade-schema": "~1.17.0+bedrock-1.26.20",
"pocketmine/bedrock-protocol": "~57.1.0+bedrock-1.26.20",
"pocketmine/bedrock-protocol": "dev-bedrock-1.26.30 as 58.0.0",
"pocketmine/binaryutils": "^0.2.1",
"pocketmine/callback-validator": "~1.0.4",
"pocketmine/color": "^0.3.0",
Expand Down
61 changes: 32 additions & 29 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions generated/data/bedrock/BiomeIds.php
Original file line number Diff line number Diff line change
Expand Up @@ -123,4 +123,5 @@ private function __construct(){
public const MANGROVE_SWAMP = 191;
public const CHERRY_GROVE = 192;
public const PALE_GARDEN = 193;
public const SULFUR_CAVES = 194;
}
1 change: 1 addition & 0 deletions generated/data/bedrock/block/BlockStateNames.php
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ private function __construct(){
public const PERSISTENT_BIT = "persistent_bit";
public const PILLAR_AXIS = "pillar_axis";
public const PORTAL_AXIS = "portal_axis";
public const POTENT_SULFUR_STATE = "potent_sulfur_state";
public const POWERED_BIT = "powered_bit";
public const POWERED_SHELF_TYPE = "powered_shelf_type";
public const PROPAGULE_STAGE = "propagule_stage";
Expand Down
6 changes: 6 additions & 0 deletions generated/data/bedrock/block/BlockStateStringValues.php
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,12 @@ private function __construct(){
public const PORTAL_AXIS_X = "x";
public const PORTAL_AXIS_Z = "z";

public const POTENT_SULFUR_STATE_CONTINUOUS = "continuous";
public const POTENT_SULFUR_STATE_DORMANT = "dormant";
public const POTENT_SULFUR_STATE_DRY = "dry";
public const POTENT_SULFUR_STATE_ERUPTING = "erupting";
public const POTENT_SULFUR_STATE_WET = "wet";

public const SEA_GRASS_TYPE_DEFAULT = "default";
public const SEA_GRASS_TYPE_DOUBLE_BOT = "double_bot";
public const SEA_GRASS_TYPE_DOUBLE_TOP = "double_top";
Expand Down
1 change: 1 addition & 0 deletions generated/data/bedrock/block/BlockTypeNames.php
Original file line number Diff line number Diff line change
Expand Up @@ -990,6 +990,7 @@ private function __construct(){
public const POLISHED_SULFUR = "minecraft:polished_sulfur";
public const POLISHED_SULFUR_DOUBLE_SLAB = "minecraft:polished_sulfur_double_slab";
public const POLISHED_SULFUR_SLAB = "minecraft:polished_sulfur_slab";
public const SULFUR_SPIKE = "minecraft:sulfur_spike";
public const POLISHED_SULFUR_STAIRS = "minecraft:polished_sulfur_stairs";
public const POLISHED_SULFUR_WALL = "minecraft:polished_sulfur_wall";
public const POLISHED_TUFF = "minecraft:polished_tuff";
Expand Down
1 change: 1 addition & 0 deletions generated/data/bedrock/item/ItemTypeNames.php
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,7 @@ final class ItemTypeNames{
public const MUSIC_DISC_5 = "minecraft:music_disc_5";
public const MUSIC_DISC_BLOCKS = "minecraft:music_disc_blocks";
public const MUSIC_DISC_CAT = "minecraft:music_disc_cat";
public const MUSIC_DISC_BOUNCE = "minecraft:music_disc_bounce";
public const MUSIC_DISC_CHIRP = "minecraft:music_disc_chirp";
public const MUSIC_DISC_CREATOR = "minecraft:music_disc_creator";
public const MUSIC_DISC_CREATOR_MUSIC_BOX = "minecraft:music_disc_creator_music_box";
Expand Down
2 changes: 1 addition & 1 deletion src/block/utils/RecordType.php
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public function getSoundName() : string{
return $this->getMetadata()[0];
}

public function getSoundId() : int{
public function getSoundId() : string{
return $this->getMetadata()[1];
}

Expand Down
4 changes: 2 additions & 2 deletions src/network/mcpe/handler/InGamePacketHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -304,15 +304,15 @@ public function handlePlayerAuthInput(PlayerAuthInputPacket $packet) : bool{
public function handleInventoryTransaction(InventoryTransactionPacket $packet) : bool{
$result = true;

if(count($packet->trData->getActions()) > 50){
if(count($packet->trData?->getActions() ?? []) > 50){
throw new PacketHandlingException("Too many actions in inventory transaction");
}
if(count($packet->requestChangedSlots) > 10){
throw new PacketHandlingException("Too many slot sync requests in inventory transaction");
}

$this->inventoryManager->setCurrentItemStackRequestId($packet->requestId);
$this->inventoryManager->addRawPredictedSlotChanges($packet->trData->getActions());
$this->inventoryManager->addRawPredictedSlotChanges($packet->trData?->getActions() ?? []);

if($packet->trData instanceof NormalTransactionData){
$result = $this->handleNormalTransaction($packet->trData, $packet->requestId);
Expand Down
3 changes: 2 additions & 1 deletion src/network/mcpe/handler/PreSpawnPacketHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,11 @@ public function setUp() : void{
false,
false,
new NetworkPermissions(disableClientSounds: true),
false,
null,
new ServerTelemetryData("", "", "", ""),
[],
0,
0
));

$this->session->getLogger()->debug("Sending items");
Expand Down
2 changes: 1 addition & 1 deletion src/world/sound/RecordStopSound.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
class RecordStopSound implements Sound{

public function encode(Vector3 $pos) : array{
return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::STOP_RECORD, $pos, false)];
return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::RECORD_NULL, $pos, false)];
}
}
Loading