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

Added static create() functions for many packets

Browse Source 
There are a few motivations here:
1) Less boilerplate code (this can be written inline)
2) It's possible to provide multiple constructors for different packet variations to reduce the chance of errors.
3) It makes things catch fire on updates in ways that static analysers can understand.
This commit is contained in:
Dylan K. Taylor
2019-06-05 15:00:08 +01:00
parent 09afb8e772
commit 287c8c2dd4
51 changed files with 481 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/pocketmine/world/World.php
View File

@@ -715,8 +715,7 @@ class World implements ChunkManager, Metadatable{
* @param Player ...$targets If empty, will send to all players in the world.
*/
public function sendTime(Player ...$targets){
$pk = new SetTimePacket();
$pk->time = $this->time & 0xffffffff; //avoid overflowing the field, since the packet uses an int32
$pk = SetTimePacket::create($this->time & 0xffffffff); //avoid overflowing the field, since the packet uses an int32
if(empty($targets)){
$this->broadcastGlobalPacket($pk);
@@ -934,28 +933,17 @@ class World implements ChunkManager, Metadatable{
if(!($b instanceof Vector3)){
throw new \TypeError("Expected Vector3 in blocks array, got " . (is_object($b) ? get_class($b) : gettype($b)));
}
$pk = new UpdateBlockPacket();
$pk->x = $b->x;
$pk->y = $b->y;
$pk->z = $b->z;
if($b instanceof Block){
$pk->blockRuntimeId = $b->getRuntimeId();
$packets[] = UpdateBlockPacket::create($b->x, $b->y, $b->z, $b->getRuntimeId());
}else{
$fullBlock = $this->getFullBlock($b->x, $b->y, $b->z);
$pk->blockRuntimeId = RuntimeBlockMapping::toStaticRuntimeId($fullBlock >> 4, $fullBlock & 0xf);
$packets[] = UpdateBlockPacket::create($b->x, $b->y, $b->z, RuntimeBlockMapping::toStaticRuntimeId($fullBlock >> 4, $fullBlock & 0xf));
}
$packets[] = $pk;
$tile = $this->getTileAt($b->x, $b->y, $b->z);
if($tile instanceof Spawnable){
$tilepk = new BlockEntityDataPacket();
$tilepk->x = $tile->x;
$tilepk->y = $tile->y;
$tilepk->z = $tile->z;
$tilepk->namedtag = $tile->getSerializedSpawnCompound();
$packets[] = $tilepk;
$packets[] = BlockEntityDataPacket::create($tile->x, $tile->y, $tile->z, $tile->getSerializedSpawnCompound());
}
}