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

Move some code around to fix block placing, breaking, and throwing snowballs

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-08-07 12:28:07 +01:00
parent 98e0a2ecba
commit 7958fffa07
7 changed files with 203 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php
View File

@ -41,30 +41,29 @@ use pocketmine\network\mcpe\protocol\DataPacket;
use pocketmine\network\mcpe\protocol\DropItemPacket;
use pocketmine\network\mcpe\protocol\EntityEventPacket;
use pocketmine\network\mcpe\protocol\EntityFallPacket;
use pocketmine\network\mcpe\protocol\EntityPickRequestPacket;
use pocketmine\network\mcpe\protocol\InteractPacket;
use pocketmine\network\mcpe\protocol\InventoryTransactionPacket;
use pocketmine\network\mcpe\protocol\ItemFrameDropItemPacket;
use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
use pocketmine\network\mcpe\protocol\LoginPacket;
use pocketmine\network\mcpe\protocol\MapInfoRequestPacket;
use pocketmine\network\mcpe\protocol\MobArmorEquipmentPacket;
use pocketmine\network\mcpe\protocol\MobEquipmentPacket;
use pocketmine\network\mcpe\protocol\ModalFormRequestPacket;
use pocketmine\network\mcpe\protocol\ModalFormResponsePacket;
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\PlayerSkinPacket;
use pocketmine\network\mcpe\protocol\RemoveBlockPacket;
use pocketmine\network\mcpe\protocol\RequestChunkRadiusPacket;
use pocketmine\network\mcpe\protocol\ResourcePackChunkRequestPacket;
use pocketmine\network\mcpe\protocol\ResourcePackClientResponsePacket;
use pocketmine\network\mcpe\protocol\ServerSettingsRequestPacket;
use pocketmine\network\mcpe\protocol\ServerSettingsResponsePacket;
use pocketmine\network\mcpe\protocol\SetPlayerGameTypePacket;
use pocketmine\network\mcpe\protocol\ShowCreditsPacket;
use pocketmine\network\mcpe\protocol\SpawnExperienceOrbPacket;
use pocketmine\network\mcpe\protocol\TextPacket;
use pocketmine\network\mcpe\protocol\UseItemPacket;
use pocketmine\Player;
use pocketmine\Server;
@ -122,16 +121,6 @@ class PlayerNetworkSessionAdapter extends NetworkSession{
return $this->player->handleMovePlayer($packet);
}
/**
* TODO: REMOVE
* @param RemoveBlockPacket $packet
*
* @return bool
*/
public function handleRemoveBlock(RemoveBlockPacket $packet) : bool{
return $this->player->handleRemoveBlock($packet);
}
public function handleLevelSoundEvent(LevelSoundEventPacket $packet) : bool{
return $this->player->handleLevelSoundEvent($packet);
}
@ -140,6 +129,10 @@ class PlayerNetworkSessionAdapter extends NetworkSession{
return $this->player->handleEntityEvent($packet);
}
public function handleInventoryTransaction(InventoryTransactionPacket $packet) : bool{
return $this->player->handleInventoryTransaction($packet); //TODO
}
public function handleMobEquipment(MobEquipmentPacket $packet) : bool{
return $this->player->handleMobEquipment($packet);
}
@ -156,14 +149,8 @@ class PlayerNetworkSessionAdapter extends NetworkSession{
return $this->player->handleBlockPickRequest($packet);
}
/**
* TODO: REMOVE
* @param UseItemPacket $packet
*
* @return bool
*/
public function handleUseItem(UseItemPacket $packet) : bool{
return $this->player->handleUseItem($packet);
public function handleEntityPickRequest(EntityPickRequestPacket $packet) : bool{
return false; //TODO
}
public function handlePlayerAction(PlayerActionPacket $packet) : bool{
@ -192,6 +179,10 @@ class PlayerNetworkSessionAdapter extends NetworkSession{
return $this->player->handleContainerClose($packet);
}
public function handlePlayerHotbar(PlayerHotbarPacket $packet) : bool{
return $this->player->handlePlayerHotbar($packet);
}
/**
* TODO: REMOVE
* @param ContainerSetSlotPacket $packet

1
src/pocketmine/network/mcpe/protocol/DataPacket.php
View File

@ -30,7 +30,6 @@ use pocketmine\entity\Entity;
use pocketmine\item\Item;
use pocketmine\math\Vector3;
use pocketmine\network\mcpe\NetworkSession;
use pocketmine\utils\Binary;
use pocketmine\utils\BinaryStream;
use pocketmine\utils\Utils;

5
src/pocketmine/network/mcpe/protocol/InventoryTransactionPacket.php
View File

@ -26,11 +26,12 @@ namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h>
use pocketmine\network\mcpe\NetworkSession;
use pocketmine\network\mcpe\protocol\types\inventory\source\InventorySource;
class InventoryTransactionPacket extends DataPacket{
const NETWORK_ID = ProtocolInfo::INVENTORY_TRANSACTION_PACKET;
const TYPE_NORMAL = 0;
const TYPE_USE_ITEM = 2;
const TYPE_USE_ITEM_ON_ENTITY = 3;
const TYPE_RELEASE_ITEM = 4;
@ -98,7 +99,7 @@ class InventoryTransactionPacket extends DataPacket{
$this->transactionData->transactionType = $type;
switch($type){
case 0:
case self::TYPE_NORMAL:
case 1:
//Regular ComplexInventoryTransaction doesn't read any extra data
break;

3
src/pocketmine/network/mcpe/protocol/PlayerHotbarPacket.php
View File

@ -27,6 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
use pocketmine\network\mcpe\NetworkSession;
use pocketmine\network\mcpe\protocol\types\ContainerIds;
use pocketmine\utils\Binary;
class PlayerHotbarPacket extends DataPacket{
const NETWORK_ID = ProtocolInfo::PLAYER_HOTBAR_PACKET;
@ -43,7 +44,7 @@ class PlayerHotbarPacket extends DataPacket{
$this->windowId = $this->getByte();
$count = $this->getUnsignedVarInt();
for($i = 0; $i < $count; ++$i){
$this->slots[$i] = $this->getUnsignedVarInt();
$this->slots[$i] = Binary::signInt($this->getUnsignedVarInt());
}
}

53
src/pocketmine/network/mcpe/protocol/RemoveBlockPacket.php
View File

@ -1,53 +0,0 @@
<?php
/*
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/
declare(strict_types=1);
namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h>
use pocketmine\network\mcpe\NetworkSession;
/**
* @removed
*/
class RemoveBlockPacket extends DataPacket{
const NETWORK_ID = ProtocolInfo::REMOVE_BLOCK_PACKET;
public $x;
public $y;
public $z;
protected function decodePayload(){
$this->getBlockPosition($this->x, $this->y, $this->z);
}
protected function encodePayload(){
$this->putBlockPosition($this->x, $this->y, $this->z);
}
public function handle(NetworkSession $session) : bool{
return $session->handleRemoveBlock($this);
}
}

76
src/pocketmine/network/mcpe/protocol/UseItemPacket.php
View File

@ -1,76 +0,0 @@
<?php
/*
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/
declare(strict_types=1);
namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h>
use pocketmine\item\Item;
use pocketmine\network\mcpe\NetworkSession;
/**
* @removed
*/
class UseItemPacket extends DataPacket{
const NETWORK_ID = ProtocolInfo::USE_ITEM_PACKET;
public $x;
public $y;
public $z;
public $blockId;
public $face;
public $fx;
public $fy;
public $fz;
public $posX;
public $posY;
public $posZ;
public $slot;
/** @var Item */
public $item;
protected function decodePayload(){
$this->getBlockPosition($this->x, $this->y, $this->z);
$this->blockId = $this->getUnsignedVarInt();
$this->face = $this->getVarInt();
$this->getVector3f($this->fx, $this->fy, $this->fz);
$this->getVector3f($this->posX, $this->posY, $this->posZ);
$this->slot = $this->getVarInt();
$this->item = $this->getSlot();
}
protected function encodePayload(){
$this->putUnsignedVarInt($this->blockId);
$this->putUnsignedVarInt($this->face);
$this->putVector3f($this->fx, $this->fy, $this->fz);
$this->putVector3f($this->posX, $this->posY, $this->posZ);
$this->putVarInt($this->slot);
$this->putSlot($this->item);
}
public function handle(NetworkSession $session) : bool{
return $session->handleUseItem($this);
}
}