Permalink
Browse files

Enabled batch block sending again

  • Loading branch information...
1 parent a72488d commit e44ed4da3b02a1dedc5fe1200101c0160ee0b3d2 @shoghicp shoghicp committed Nov 29, 2014
Showing with 19 additions and 19 deletions.
  1. +15 −15 src/pocketmine/Player.php
  2. +4 −4 src/pocketmine/level/Level.php
@@ -1144,22 +1144,22 @@ protected function processMovement($currentTick){
$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;
-
- Server::broadcastPacket($this->hasSpawned, $pk);
+ 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);
+ }
}
}
}
@@ -514,7 +514,7 @@ public function doTick($currentTick){
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 @@ public function setBlock(Vector3 $pos, Block $block, $direct = false, $update =
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 @@ public function setBlock(Vector3 $pos, Block $block, $direct = false, $update =
$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 @@ public function setBlock(Vector3 $pos, Block $block, $direct = false, $update =
$this->changedCount[$index] |= 1 << $Y;
}
$this->changedBlocks[$index][$Y][] = clone $block;
- }*/
+ }
if($update === true){
$this->updateAllLight($block);

0 comments on commit e44ed4d

Please sign in to comment.