mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-07 12:18:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mcpe-1.0

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-01-10 10:55:05 +00:00
commit 8f797442b3
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -560,7 +560,7 @@ class Item implements ItemIds, \JsonSerializable{
$this->clearCustomName(); $this->clearCustomName();
} }
if(!($hadCompoundTag = $this->hasCompoundTag())){ if(!$this->hasCompoundTag()){
$tag = new CompoundTag("", []); $tag = new CompoundTag("", []);
}else{ }else{
$tag = $this->getNamedTag(); $tag = $this->getNamedTag();
@ -574,9 +574,7 @@ class Item implements ItemIds, \JsonSerializable{
]); ]);
} }
if(!$hadCompoundTag){
$this->setCompoundTag($tag); $this->setCompoundTag($tag);
}
return $this; return $this;
} }

4
src/pocketmine/level/generator/normal/Normal.php
View File

@ -119,9 +119,9 @@ class Normal extends Generator{
$this->random->setSeed($this->level->getSeed()); $this->random->setSeed($this->level->getSeed());
$this->selector = new BiomeSelector($this->random, function($temperature, $rainfall){ $this->selector = new BiomeSelector($this->random, function($temperature, $rainfall){
if($rainfall < 0.25){ if($rainfall < 0.25){
if($rainfall < 0.7){ if($temperature < 0.7){
return Biome::OCEAN; return Biome::OCEAN;
}elseif($rainfall < 0.85){ }elseif($temperature < 0.85){
return Biome::RIVER; return Biome::RIVER;
}else{ }else{
return Biome::SWAMP; return Biome::SWAMP;