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

Cleaned up isEncoded mess

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-07-13 12:21:26 +01:00
parent 6341d3a0dc
commit 3a214b7ce6
5 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/Server.php
View File

@ -1817,7 +1817,6 @@ class Server{
*/ */
public function broadcastPacket(array $players, DataPacket $packet){ public function broadcastPacket(array $players, DataPacket $packet){
$packet->encode(); $packet->encode();
$packet->isEncoded = true;
$this->batchPackets($players, [$packet], false); $this->batchPackets($players, [$packet], false);
} }
@ -1867,7 +1866,6 @@ class Server{
public function broadcastPacketsCallback(BatchPacket $pk, array $identifiers, bool $immediate = false){ public function broadcastPacketsCallback(BatchPacket $pk, array $identifiers, bool $immediate = false){
if(!$pk->isEncoded){ if(!$pk->isEncoded){
$pk->encode(); $pk->encode();
$pk->isEncoded = true;
} }
if($immediate){ if($immediate){

1
src/pocketmine/inventory/CraftingManager.php
View File

@ -112,7 +112,6 @@ class CraftingManager{
} }
$pk->encode(); $pk->encode();
$pk->isEncoded = true;
$this->craftingDataCache = $pk; $this->craftingDataCache = $pk;
Timings::$craftingDataCacheRebuildTimer->stopTiming(); Timings::$craftingDataCacheRebuildTimer->stopTiming();

2
src/pocketmine/inventory/PlayerInventory.php
View File

@ -420,7 +420,6 @@ class PlayerInventory extends BaseInventory{
$pk->entityRuntimeId = $this->getHolder()->getId(); $pk->entityRuntimeId = $this->getHolder()->getId();
$pk->slots = $armor; $pk->slots = $armor;
$pk->encode(); $pk->encode();
$pk->isEncoded = true;
foreach($target as $player){ foreach($target as $player){
if($player === $this->getHolder()){ if($player === $this->getHolder()){
@ -468,7 +467,6 @@ class PlayerInventory extends BaseInventory{
$pk->entityRuntimeId = $this->getHolder()->getId(); $pk->entityRuntimeId = $this->getHolder()->getId();
$pk->slots = $armor; $pk->slots = $armor;
$pk->encode(); $pk->encode();
$pk->isEncoded = true;
foreach($target as $player){ foreach($target as $player){
if($player === $this->getHolder()){ if($player === $this->getHolder()){

1
src/pocketmine/network/mcpe/RakLibInterface.php
View File

@ -200,7 +200,6 @@ class RakLibInterface implements ServerInstance, AdvancedSourceInterface{
$identifier = $this->identifiers[$h]; $identifier = $this->identifiers[$h];
if(!$packet->isEncoded){ if(!$packet->isEncoded){
$packet->encode(); $packet->encode();
$packet->isEncoded = true;
} }
if($packet instanceof BatchPacket){ if($packet instanceof BatchPacket){

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

@ -70,6 +70,7 @@ abstract class DataPacket extends BinaryStream{
public function encode(){ public function encode(){
$this->reset(); $this->reset();
$this->encodePayload(); $this->encodePayload();
$this->isEncoded = true;
} }
/** /**