From ae76ac82c8125601e416e2ec8974f58443f18ecf Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 9 Oct 2017 09:44:22 +0100 Subject: [PATCH] Removed unnecessary delegate packet handlers let's keep all the TODOs in one place --- src/pocketmine/Player.php | 35 ------------------- .../mcpe/PlayerNetworkSessionAdapter.php | 14 ++++---- 2 files changed, 7 insertions(+), 42 deletions(-) diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index 1bedce0ab..79b044e9d 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -107,10 +107,7 @@ use pocketmine\network\mcpe\protocol\BatchPacket; use pocketmine\network\mcpe\protocol\BlockEntityDataPacket; use pocketmine\network\mcpe\protocol\BlockPickRequestPacket; use pocketmine\network\mcpe\protocol\BookEditPacket; -use pocketmine\network\mcpe\protocol\BossEventPacket; use pocketmine\network\mcpe\protocol\ChunkRadiusUpdatedPacket; -use pocketmine\network\mcpe\protocol\ClientToServerHandshakePacket; -use pocketmine\network\mcpe\protocol\CommandBlockUpdatePacket; use pocketmine\network\mcpe\protocol\ContainerClosePacket; use pocketmine\network\mcpe\protocol\DataPacket; use pocketmine\network\mcpe\protocol\DisconnectPacket; @@ -121,12 +118,10 @@ use pocketmine\network\mcpe\protocol\ItemFrameDropItemPacket; use pocketmine\network\mcpe\protocol\LevelEventPacket; use pocketmine\network\mcpe\protocol\LevelSoundEventPacket; use pocketmine\network\mcpe\protocol\LoginPacket; -use pocketmine\network\mcpe\protocol\MapInfoRequestPacket; use pocketmine\network\mcpe\protocol\MobEquipmentPacket; use pocketmine\network\mcpe\protocol\MovePlayerPacket; use pocketmine\network\mcpe\protocol\PlayerActionPacket; use pocketmine\network\mcpe\protocol\PlayerHotbarPacket; -use pocketmine\network\mcpe\protocol\PlayerInputPacket; use pocketmine\network\mcpe\protocol\PlayStatusPacket; use pocketmine\network\mcpe\protocol\ProtocolInfo; use pocketmine\network\mcpe\protocol\RequestChunkRadiusPacket; @@ -140,8 +135,6 @@ use pocketmine\network\mcpe\protocol\RespawnPacket; use pocketmine\network\mcpe\protocol\SetPlayerGameTypePacket; use pocketmine\network\mcpe\protocol\SetSpawnPositionPacket; use pocketmine\network\mcpe\protocol\SetTitlePacket; -use pocketmine\network\mcpe\protocol\ShowCreditsPacket; -use pocketmine\network\mcpe\protocol\SpawnExperienceOrbPacket; use pocketmine\network\mcpe\protocol\StartGamePacket; use pocketmine\network\mcpe\protocol\TakeItemEntityPacket; use pocketmine\network\mcpe\protocol\TextPacket; @@ -2035,10 +2028,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ } } - public function handleClientToServerHandshake(ClientToServerHandshakePacket $packet) : bool{ - return false; //TODO - } - public function handleResourcePackClientResponse(ResourcePackClientResponsePacket $packet) : bool{ switch($packet->status){ case ResourcePackClientResponsePacket::STATUS_REFUSED: @@ -2889,10 +2878,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ return true; } - public function handlePlayerInput(PlayerInputPacket $packet) : bool{ - return false; //TODO - } - public function handleSetPlayerGameType(SetPlayerGameTypePacket $packet) : bool{ if($packet->gamemode !== $this->gamemode){ //Set this back to default. TODO: handle this properly @@ -2902,14 +2887,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ return true; } - public function handleSpawnExperienceOrb(SpawnExperienceOrbPacket $packet) : bool{ - return false; //TODO - } - - public function handleMapInfoRequest(MapInfoRequestPacket $packet) : bool{ - return false; //TODO - } - public function handleRequestChunkRadius(RequestChunkRadiusPacket $packet) : bool{ $this->setViewDistance($packet->radius); @@ -2945,18 +2922,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ return true; } - public function handleBossEvent(BossEventPacket $packet) : bool{ - return false; //TODO - } - - public function handleShowCredits(ShowCreditsPacket $packet) : bool{ - return false; //TODO: handle resume - } - - public function handleCommandBlockUpdate(CommandBlockUpdatePacket $packet) : bool{ - return false; //TODO - } - public function handleResourcePackChunkRequest(ResourcePackChunkRequestPacket $packet) : bool{ $manager = $this->server->getResourceManager(); $pack = $manager->getPackById($packet->packId); diff --git a/src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php b/src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php index bcfb73dca..ab2672636 100644 --- a/src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php +++ b/src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php @@ -101,7 +101,7 @@ class PlayerNetworkSessionAdapter extends NetworkSession{ } public function handleClientToServerHandshake(ClientToServerHandshakePacket $packet) : bool{ - return $this->player->handleClientToServerHandshake($packet); + return false; //TODO } public function handleResourcePackClientResponse(ResourcePackClientResponsePacket $packet) : bool{ @@ -185,7 +185,7 @@ class PlayerNetworkSessionAdapter extends NetworkSession{ } public function handlePlayerInput(PlayerInputPacket $packet) : bool{ - return $this->player->handlePlayerInput($packet); + return false; //TODO } public function handleSetPlayerGameType(SetPlayerGameTypePacket $packet) : bool{ @@ -193,11 +193,11 @@ class PlayerNetworkSessionAdapter extends NetworkSession{ } public function handleSpawnExperienceOrb(SpawnExperienceOrbPacket $packet) : bool{ - return $this->player->handleSpawnExperienceOrb($packet); + return false; //TODO } public function handleMapInfoRequest(MapInfoRequestPacket $packet) : bool{ - return $this->player->handleMapInfoRequest($packet); + return false; //TODO } public function handleRequestChunkRadius(RequestChunkRadiusPacket $packet) : bool{ @@ -209,11 +209,11 @@ class PlayerNetworkSessionAdapter extends NetworkSession{ } public function handleBossEvent(BossEventPacket $packet) : bool{ - return $this->player->handleBossEvent($packet); + return false; //TODO } public function handleShowCredits(ShowCreditsPacket $packet) : bool{ - return $this->player->handleShowCredits($packet); + return false; //TODO: handle resume } public function handleCommandRequest(CommandRequestPacket $packet) : bool{ @@ -221,7 +221,7 @@ class PlayerNetworkSessionAdapter extends NetworkSession{ } public function handleCommandBlockUpdate(CommandBlockUpdatePacket $packet) : bool{ - return $this->player->handleCommandBlockUpdate($packet); + return false; //TODO } public function handleResourcePackChunkRequest(ResourcePackChunkRequestPacket $packet) : bool{