Merge remote-tracking branch 'upstream/master'

src/CloseFormPacket.php → src/ClientboundCloseFormPacket.php

@@ -16,8 +16,8 @@
 
 use pocketmine\network\mcpe\protocol\serializer\PacketSerializer;
 
-class CloseFormPacket extends DataPacket implements ClientboundPacket{
-	public const NETWORK_ID = ProtocolInfo::CLOSE_FORM_PACKET;
+class ClientboundCloseFormPacket extends DataPacket implements ClientboundPacket{
+	public const NETWORK_ID = ProtocolInfo::CLIENTBOUND_CLOSE_FORM_PACKET;
 
 	/**
 	 * @generate-create-func
@@ -27,11 +27,11 @@ public static function create() : self{
 	}
 
 	protected function decodePayload(PacketSerializer $in) : void{
-
+		//No payload
 	}
 
 	protected function encodePayload(PacketSerializer $out) : void{
-
+		//No payload
 	}
 
 	public function handle(PacketHandlerInterface $handler) : bool{

src/PacketHandlerDefaultImplTrait.php

@@ -810,7 +810,7 @@ public function handleAwardAchievement(AwardAchievementPacket $packet) : bool{
 		return false;
 	}
 
-	public function handleCloseForm(CloseFormPacket $packet) : bool{
+	public function handleCloseForm(ClientboundCloseFormPacket $packet) : bool{
 		return false;
 	}
 }

src/PacketHandlerInterface.php

@@ -412,5 +412,5 @@ public function handleSetHud(SetHudPacket $packet) : bool;
 
 	public function handleAwardAchievement(AwardAchievementPacket $packet) : bool;
 
-	public function handleCloseForm(CloseFormPacket $packet) : bool;
+	public function handleCloseForm(ClientboundCloseFormPacket $packet) : bool;
 }

src/PacketPool.php

@@ -230,7 +230,7 @@ public function __construct(){
 		$this->registerPacket(new SetPlayerInventoryOptionsPacket());
 		$this->registerPacket(new SetHudPacket());
 		$this->registerPacket(new AwardAchievementPacket());
-		$this->registerPacket(new CloseFormPacket());
+		$this->registerPacket(new ClientboundCloseFormPacket());
 	}
 
 	public function registerPacket(Packet $packet) : void{

src/ProtocolInfo.php

@@ -269,6 +269,6 @@ private function __construct(){
 	public const SET_PLAYER_INVENTORY_OPTIONS_PACKET = 0x133;
 	public const SET_HUD_PACKET = 0x134;
 	public const AWARD_ACHIEVEMENT_PACKET = 0x135;
-	public const CLOSE_FORM_PACKET = 0x136;
+	public const CLIENTBOUND_CLOSE_FORM_PACKET = 0x136;
 
 }