From 9bc8d8db79cdf692fc5c5a158008d2fe395e2843 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 28 Sep 2017 14:29:17 +0100 Subject: [PATCH] Revert "Add buffering for non-immediate priority packets to reduce compression overhead" This reverts commit 2162675b6400807cf650f6fc7ad236c52fa99c01. This broke Human skins... it seems MCPE doesn't like you adding and removing a player from the list in the same batch. --- src/pocketmine/Player.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index 451a11287..ec83d3c61 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -1064,10 +1064,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ return false; } - if(!$packet->canBeBatched()){ - throw new \InvalidArgumentException(get_class($packet) . " cannot be added to batch buffer"); - } - $timings = Timings::getSendDataPacketTimings($packet); $timings->startTiming(); $this->server->getPluginManager()->callEvent($ev = new DataPacketSendEvent($this, $packet)); @@ -1126,12 +1122,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ return false; } - if(!$needACK and !$immediate and $packet->canBeBatched()){ - $this->batchedPackets[] = clone $packet; - - return true; - } - $identifier = $this->interface->putPacket($this, $packet, $needACK, $immediate); if($needACK and $identifier !== null){