Merge remote-tracking branch 'origin/mcpe-0.12' into php7

This commit is contained in:
Shoghi Cervantes
2015-09-12 01:03:09 +02:00
7 changed files with 50 additions and 10 deletions

View File

@ -872,7 +872,7 @@ class Level implements ChunkManager, Metadatable{
}
if(count($this->blockCache) > 2048){
$this->chunkCache = [];
$this->blockCache = [];
}
}
@ -2340,7 +2340,7 @@ class Level implements ChunkManager, Metadatable{
$this->server->getPluginManager()->callEvent(new SpawnChangeEvent($this, $previousSpawn));
}
public function requestChunk($x, $z, Player $player, $order = LevelProvider::ORDER_ZXY){
public function requestChunk($x, $z, Player $player){
$index = Level::chunkHash($x, $z);
if(!isset($this->chunkSendQueue[$index])){
$this->chunkSendQueue[$index] = [];

View File

@ -0,0 +1,31 @@
<?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/
*
*
*/
namespace pocketmine\level\sound;
use pocketmine\math\Vector3;
use pocketmine\network\protocol\LevelEventPacket;
class EndermanTeleportSound extends GenericSound{
public function __construct(Vector3 $pos){
parent::__construct($pos, LevelEventPacket::EVENT_SOUND_ENDERMAN_TELEPORT);
}
}