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

Extract a Packet interface from DataPacket

Browse Source 
this is in preparation for clientbound/serverbound packet separation. I did this already on another branch, but the changeset was dependent on a massive refactor to split apart packets and binarystream which i'm still not fully happy with.
This commit is contained in:
Dylan K. Taylor
2019-01-17 12:21:56 +00:00
parent 9c0ebb6350
commit b82e00ffdf
15 changed files with 167 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/pocketmine/event/server/DataPacketBroadcastEvent.php
View File

@ -25,7 +25,7 @@ namespace pocketmine\event\server;
use pocketmine\event\Cancellable;
use pocketmine\event\CancellableTrait;
use pocketmine\network\mcpe\protocol\DataPacket;
use pocketmine\network\mcpe\protocol\Packet;
use pocketmine\Player;
/**
@ -36,12 +36,12 @@ class DataPacketBroadcastEvent extends ServerEvent implements Cancellable{
/** @var Player[] */
private $players;
/** @var DataPacket[] */
/** @var Packet[] */
private $packets;
/**
* @param Player[] $players
* @param DataPacket[] $packets
* @param Player[] $players
* @param Packet[] $packets
*/
public function __construct(array $players, array $packets){
$this->players = $players;
@ -63,14 +63,14 @@ class DataPacketBroadcastEvent extends ServerEvent implements Cancellable{
}
/**
* @return DataPacket[]
* @return Packet[]
*/
public function getPackets() : array{
return $this->packets;
}
/**
* @param DataPacket[] $packets
* @param Packet[] $packets
*/
public function setPackets(array $packets) : void{
$this->packets = $packets;

14
src/pocketmine/event/server/DataPacketReceiveEvent.php
View File

@ -25,30 +25,30 @@ namespace pocketmine\event\server;
use pocketmine\event\Cancellable;
use pocketmine\event\CancellableTrait;
use pocketmine\network\mcpe\protocol\DataPacket;
use pocketmine\network\mcpe\protocol\Packet;
use pocketmine\Player;
class DataPacketReceiveEvent extends ServerEvent implements Cancellable{
use CancellableTrait;
/** @var DataPacket */
/** @var Packet */
private $packet;
/** @var Player */
private $player;
/**
* @param Player $player
* @param DataPacket $packet
* @param Player $player
* @param Packet $packet
*/
public function __construct(Player $player, DataPacket $packet){
public function __construct(Player $player, Packet $packet){
$this->packet = $packet;
$this->player = $player;
}
/**
* @return DataPacket
* @return Packet
*/
public function getPacket() : DataPacket{
public function getPacket() : Packet{
return $this->packet;
}

14
src/pocketmine/event/server/DataPacketSendEvent.php
View File

@ -25,30 +25,30 @@ namespace pocketmine\event\server;
use pocketmine\event\Cancellable;
use pocketmine\event\CancellableTrait;
use pocketmine\network\mcpe\protocol\DataPacket;
use pocketmine\network\mcpe\protocol\Packet;
use pocketmine\Player;
class DataPacketSendEvent extends ServerEvent implements Cancellable{
use CancellableTrait;
/** @var DataPacket */
/** @var Packet */
private $packet;
/** @var Player */
private $player;
/**
* @param Player $player
* @param DataPacket $packet
* @param Player $player
* @param Packet $packet
*/
public function __construct(Player $player, DataPacket $packet){
public function __construct(Player $player, Packet $packet){
$this->packet = $packet;
$this->player = $player;
}
/**
* @return DataPacket
* @return Packet
*/
public function getPacket() : DataPacket{
public function getPacket() : Packet{
return $this->packet;
}