From e44ed4da3b02a1dedc5fe1200101c0160ee0b3d2 Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Sat, 29 Nov 2014 12:58:31 +0100
Subject: [PATCH] Enabled batch block sending again

---
 src/pocketmine/Player.php      | 28 ++++++++++++++--------------
 src/pocketmine/level/Level.php |  8 ++++----
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index 91903b68f..973c5030d 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -1144,22 +1144,22 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
 				$ev = new PlayerMoveEvent($this, $from, $to);
 
 				$this->server->getPluginManager()->callEvent($ev);
-			}
 
-			if(!($revert = $ev->isCancelled())){ //Yes, this is intended
-				if($to->distance($ev->getTo()) > 0.1){ //If plugins modify the destination
-					$this->teleport($ev->getTo());
-				}else{
-					$pk = new MovePlayerPacket();
-					$pk->eid = $this->id;
-					$pk->x = $this->x;
-					$pk->y = $this->y;
-					$pk->z = $this->z;
-					$pk->yaw = $this->yaw;
-					$pk->pitch = $this->pitch;
-					$pk->bodyYaw = $this->yaw;
+				if(!($revert = $ev->isCancelled())){ //Yes, this is intended
+					if($to->distance($ev->getTo()) > 0.1){ //If plugins modify the destination
+						$this->teleport($ev->getTo());
+					}else{
+						$pk = new MovePlayerPacket();
+						$pk->eid = $this->id;
+						$pk->x = $this->x;
+						$pk->y = $this->y;
+						$pk->z = $this->z;
+						$pk->yaw = $this->yaw;
+						$pk->pitch = $this->pitch;
+						$pk->bodyYaw = $this->yaw;
 
-					Server::broadcastPacket($this->hasSpawned, $pk);
+						Server::broadcastPacket($this->hasSpawned, $pk);
+					}
 				}
 			}
 		}
diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php
index 5144f1f67..b5991af41 100644
--- a/src/pocketmine/level/Level.php
+++ b/src/pocketmine/level/Level.php
@@ -514,7 +514,7 @@ class Level implements ChunkManager, Metadatable{
 						if(($mini & (1 << $Y)) === 0){
 							continue;
 						}
-						if(count($this->changedBlocks[$index][$Y]) < 582){ //Optimal value, calculated using the relation between minichunks and single packets
+						if(count($this->changedBlocks[$index][$Y]) < 256){
 							continue;
 						}else{
 							$X = null;
@@ -1056,7 +1056,7 @@ class Level implements ChunkManager, Metadatable{
 				Cache::remove("world:" . $this->getID() . ":" . $index);
 			}
 
-			//if($direct === true){
+			if($direct === true){
 				$pk = new UpdateBlockPacket();
 				$pk->x = $pos->x;
 				$pk->y = $pos->y;
@@ -1065,7 +1065,7 @@ class Level implements ChunkManager, Metadatable{
 				$pk->meta = $block->getDamage();
 
 				Server::broadcastPacket($this->getUsingChunk($pos->x >> 4, $pos->z >> 4), $pk);
-			/*}else{
+			}else{
 				if(!($pos instanceof Position)){
 					$pos = $this->temporalPosition->setComponents($pos->x, $pos->y, $pos->z);
 				}
@@ -1080,7 +1080,7 @@ class Level implements ChunkManager, Metadatable{
 					$this->changedCount[$index] |= 1 << $Y;
 				}
 				$this->changedBlocks[$index][$Y][] = clone $block;
-			}*/
+			}
 
 			if($update === true){
 				$this->updateAllLight($block);