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

Merge branch 'stable' of github.com:pmmp/PocketMine-MP into stable

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-04-16 00:11:01 +01:00
commit b94bbf6f5e
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
composer.lock generated
View File

@ -8,16 +8,16 @@
"packages": [ "packages": [
{ {
"name": "adhocore/json-comment", "name": "adhocore/json-comment",
"version": "1.1.0", "version": "1.1.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/adhocore/php-json-comment.git", "url": "https://github.com/adhocore/php-json-comment.git",
"reference": "cf7998124d1050b83d7d985447fefd630e09c1a2" "reference": "fc2f76979f0a44a5f5bc2a2b600d0762fe0e78e7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/adhocore/php-json-comment/zipball/cf7998124d1050b83d7d985447fefd630e09c1a2", "url": "https://api.github.com/repos/adhocore/php-json-comment/zipball/fc2f76979f0a44a5f5bc2a2b600d0762fe0e78e7",
"reference": "cf7998124d1050b83d7d985447fefd630e09c1a2", "reference": "fc2f76979f0a44a5f5bc2a2b600d0762fe0e78e7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -51,7 +51,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/adhocore/php-json-comment/issues", "issues": "https://github.com/adhocore/php-json-comment/issues",
"source": "https://github.com/adhocore/php-json-comment/tree/1.1.0" "source": "https://github.com/adhocore/php-json-comment/tree/1.1.2"
}, },
"funding": [ "funding": [
{ {
@ -59,7 +59,7 @@
"type": "custom" "type": "custom"
} }
], ],
"time": "2021-04-05T13:11:13+00:00" "time": "2021-04-09T03:06:06+00:00"
}, },
{ {
"name": "pocketmine/binaryutils", "name": "pocketmine/binaryutils",

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

@ -144,12 +144,9 @@ class Normal extends Generator{
return Biome::BIRCH_FOREST; return Biome::BIRCH_FOREST;
} }
}else{ }else{
//FIXME: This will always cause River to be used since the rainfall is always greater than 0.8 if we if($temperature < 0.20){
//reached this branch. However I don't think that substituting temperature for rainfall is correct given
//that mountain biomes are supposed to be pretty cold.
if($rainfall < 0.25){
return Biome::MOUNTAINS; return Biome::MOUNTAINS;
}elseif($rainfall < 0.70){ }elseif($temperature < 0.40){
return Biome::SMALL_MOUNTAINS; return Biome::SMALL_MOUNTAINS;
}else{ }else{
return Biome::RIVER; return Biome::RIVER;