mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-13 09:19:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into mcpe-0.11

Browse Source
This commit is contained in:
Shoghi Cervantes 2015-03-26 01:32:44 +01:00
commit ed2ba70a29
No known key found for this signature in database
GPG Key ID: 78464DB0A7837F89
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/item/Item.php
View File

@ -316,7 +316,7 @@ class Item{
const WOODEN_DOOR = 324;
const BUCKET = 325;
const MINECART = 329;
const MINECART = 328;
const IRON_DOOR = 330;
const REDSTONE = 331;

20
src/pocketmine/level/generator/Flat.php
View File

@ -60,6 +60,7 @@ class Flat extends Generator{
$this->preset = "2;7,2x3,2;1;";
//$this->preset = "2;7,59x1,3x3,2;1;spawn(radius=10 block=89),decoration(treecount=80 grasscount=45)";
$this->options = $options;
$this->chunk = null;
if(isset($this->options["decoration"])){
$ores = new Ore();
@ -81,7 +82,7 @@ class Flat extends Generator{
}*/
}
protected function parsePreset($preset){
protected function parsePreset($preset, $chunkX, $chunkZ){
$this->preset = $preset;
$preset = explode(";", $preset);
$version = (int) $preset[0];
@ -107,11 +108,7 @@ class Flat extends Generator{
}
$chunk = $this->level->getChunk(0, 0);
if($chunk === null){
return;
}
$this->chunk = clone $chunk;
$this->chunk = clone $this->level->getChunk($chunkX, $chunkZ);
$this->chunk->setGenerated();
for($Z = 0; $Z < 16; ++$Z){
@ -145,15 +142,24 @@ class Flat extends Generator{
$this->level = $level;
$this->random = $random;
/*
// Commented out : We want to delay this
if(isset($this->options["preset"]) and $this->options["preset"] != ""){
$this->parsePreset($this->options["preset"]);
}else{
$this->parsePreset($this->preset);
}
*/
}
public function generateChunk($chunkX, $chunkZ){
if($this->chunk === null) {
if(isset($this->options["preset"]) and $this->options["preset"] != ""){
$this->parsePreset($this->options["preset"], $chunkX, $chunkZ);
}else{
$this->parsePreset($this->preset, $chunkX, $chunkZ);
}
}
$chunk = clone $this->chunk;
$chunk->setX($chunkX);
$chunk->setZ($chunkZ);