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

RuntimeBlockMapping::toRuntimeId() now accepts a single integer instead of id/meta

Browse Source 
the expectation is that eventually this will receive arbitrary internal runtime IDs instead of static id/meta, and RuntimeBlockMapping doesn't really care about this crap anyway.
This commit is contained in:
Dylan K. Taylor
2020-09-20 12:16:11 +01:00
parent 42b184c113
commit 5661d0496f
11 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/world/sound/BlockBreakSound.php
View File

@ -38,6 +38,6 @@ class BlockBreakSound implements Sound{
}
public function encode(?Vector3 $pos){
return LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_BREAK, $pos, RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getId(), $this->block->getMeta()));
return LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_BREAK, $pos, RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getFullId()));
}
}

2
src/world/sound/BlockPlaceSound.php
View File

@ -38,6 +38,6 @@ class BlockPlaceSound implements Sound{
}
public function encode(?Vector3 $pos){
return LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_PLACE, $pos, RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getId(), $this->block->getMeta()));
return LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_PLACE, $pos, RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getFullId()));
}
}

2
src/world/sound/BlockPunchSound.php
View File

@ -44,7 +44,7 @@ class BlockPunchSound implements Sound{
return LevelSoundEventPacket::create(
LevelSoundEventPacket::SOUND_HIT,
$pos,
RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getId(), $this->block->getMeta())
RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getFullId())
);
}
}

2
src/world/sound/EntityLandSound.php
View File

@ -48,7 +48,7 @@ class EntityLandSound implements Sound{
return LevelSoundEventPacket::create(
LevelSoundEventPacket::SOUND_LAND,
$pos,
RuntimeBlockMapping::getInstance()->toRuntimeId($this->blockLandedOn->getId(), $this->blockLandedOn->getMeta()),
RuntimeBlockMapping::getInstance()->toRuntimeId($this->blockLandedOn->getFullId()),
$this->entity::getNetworkTypeId()
//TODO: does isBaby have any relevance here?
);