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

Merge branch '3.5'

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-02-07 17:12:49 +00:00
parent b7973ef782 1d0ffa06f8
commit 1a8a04eab8
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
composer.lock generated
View File

@ -277,7 +277,7 @@
{ {
"name": "Berry Langerak", "name": "Berry Langerak",
"email": "berry@berryllium.nl", "email": "berry@berryllium.nl",
"role": "developer" "role": "Developer"
}, },
{ {
"name": "Rick van der Staaij", "name": "Rick van der Staaij",
@ -372,12 +372,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/pmmp/NBT.git", "url": "https://github.com/pmmp/NBT.git",
"reference": "6f00e4f6c31d69bb9b7c19467dd70462616a45a2" "reference": "87a0312552d679365c6e3304637cd0e3963175da"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/pmmp/NBT/zipball/6f00e4f6c31d69bb9b7c19467dd70462616a45a2", "url": "https://api.github.com/repos/pmmp/NBT/zipball/87a0312552d679365c6e3304637cd0e3963175da",
"reference": "6f00e4f6c31d69bb9b7c19467dd70462616a45a2", "reference": "87a0312552d679365c6e3304637cd0e3963175da",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -405,7 +405,7 @@
"source": "https://github.com/pmmp/NBT/tree/master", "source": "https://github.com/pmmp/NBT/tree/master",
"issues": "https://github.com/pmmp/NBT/issues" "issues": "https://github.com/pmmp/NBT/issues"
}, },
"time": "2019-01-21T20:39:55+00:00" "time": "2019-02-07T17:04:08+00:00"
}, },
{ {
"name": "pocketmine/raklib", "name": "pocketmine/raklib",
@ -413,12 +413,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/pmmp/RakLib.git", "url": "https://github.com/pmmp/RakLib.git",
"reference": "7fd825ad208b0d7d622c55583cae9a8e21eaa3eb" "reference": "44ebbd68eeb25c07f1d4c1d1af1f7abd5904b76c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/pmmp/RakLib/zipball/7fd825ad208b0d7d622c55583cae9a8e21eaa3eb", "url": "https://api.github.com/repos/pmmp/RakLib/zipball/44ebbd68eeb25c07f1d4c1d1af1f7abd5904b76c",
"reference": "7fd825ad208b0d7d622c55583cae9a8e21eaa3eb", "reference": "44ebbd68eeb25c07f1d4c1d1af1f7abd5904b76c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -446,7 +446,7 @@
"source": "https://github.com/pmmp/RakLib/tree/master", "source": "https://github.com/pmmp/RakLib/tree/master",
"issues": "https://github.com/pmmp/RakLib/issues" "issues": "https://github.com/pmmp/RakLib/issues"
}, },
"time": "2019-01-21T19:44:18+00:00" "time": "2019-01-26T16:51:18+00:00"
}, },
{ {
"name": "pocketmine/snooze", "name": "pocketmine/snooze",

2
resources/locale

Submodule resources/locale updated: 1d525a7c1c...5dad5db214

4
src/pocketmine/block/TallGrass.php
View File

@ -37,8 +37,8 @@ class TallGrass extends Flowable{
} }
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{ public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
$down = $this->getSide(Facing::DOWN); $down = $this->getSide(Facing::DOWN)->getId();
if($down->getId() === self::GRASS){ if($down === self::GRASS or $down === self::DIRT){
return parent::place($item, $blockReplace, $blockClicked, $face, $clickVector, $player); return parent::place($item, $blockReplace, $blockClicked, $face, $clickVector, $player);
} }

2
tests/plugins/PocketMine-DevTools

Submodule tests/plugins/PocketMine-DevTools updated: bf19329aa7...dafd417d0b

2
tests/preprocessor

Submodule tests/preprocessor updated: b87380457e...cab4e6ceb1