diff --git a/composer.lock b/composer.lock index 2d76023ff..c17d7b67f 100644 --- a/composer.lock +++ b/composer.lock @@ -277,7 +277,7 @@ { "name": "Berry Langerak", "email": "berry@berryllium.nl", - "role": "developer" + "role": "Developer" }, { "name": "Rick van der Staaij", @@ -372,12 +372,12 @@ "source": { "type": "git", "url": "https://github.com/pmmp/NBT.git", - "reference": "6f00e4f6c31d69bb9b7c19467dd70462616a45a2" + "reference": "87a0312552d679365c6e3304637cd0e3963175da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/NBT/zipball/6f00e4f6c31d69bb9b7c19467dd70462616a45a2", - "reference": "6f00e4f6c31d69bb9b7c19467dd70462616a45a2", + "url": "https://api.github.com/repos/pmmp/NBT/zipball/87a0312552d679365c6e3304637cd0e3963175da", + "reference": "87a0312552d679365c6e3304637cd0e3963175da", "shasum": "" }, "require": { @@ -405,7 +405,7 @@ "source": "https://github.com/pmmp/NBT/tree/master", "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", @@ -413,12 +413,12 @@ "source": { "type": "git", "url": "https://github.com/pmmp/RakLib.git", - "reference": "7fd825ad208b0d7d622c55583cae9a8e21eaa3eb" + "reference": "44ebbd68eeb25c07f1d4c1d1af1f7abd5904b76c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/RakLib/zipball/7fd825ad208b0d7d622c55583cae9a8e21eaa3eb", - "reference": "7fd825ad208b0d7d622c55583cae9a8e21eaa3eb", + "url": "https://api.github.com/repos/pmmp/RakLib/zipball/44ebbd68eeb25c07f1d4c1d1af1f7abd5904b76c", + "reference": "44ebbd68eeb25c07f1d4c1d1af1f7abd5904b76c", "shasum": "" }, "require": { @@ -446,7 +446,7 @@ "source": "https://github.com/pmmp/RakLib/tree/master", "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", diff --git a/resources/locale b/resources/locale index 1d525a7c1..5dad5db21 160000 --- a/resources/locale +++ b/resources/locale @@ -1 +1 @@ -Subproject commit 1d525a7c1c268e34eaa9763803ee43517d51c161 +Subproject commit 5dad5db214ce0c94be0235e93d8253d0aec19c82 diff --git a/src/pocketmine/block/TallGrass.php b/src/pocketmine/block/TallGrass.php index 1993c1e91..43e8f685d 100644 --- a/src/pocketmine/block/TallGrass.php +++ b/src/pocketmine/block/TallGrass.php @@ -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{ - $down = $this->getSide(Facing::DOWN); - if($down->getId() === self::GRASS){ + $down = $this->getSide(Facing::DOWN)->getId(); + if($down === self::GRASS or $down === self::DIRT){ return parent::place($item, $blockReplace, $blockClicked, $face, $clickVector, $player); } diff --git a/tests/plugins/PocketMine-DevTools b/tests/plugins/PocketMine-DevTools index bf19329aa..dafd417d0 160000 --- a/tests/plugins/PocketMine-DevTools +++ b/tests/plugins/PocketMine-DevTools @@ -1 +1 @@ -Subproject commit bf19329aa7f9d6e4bc20919f7d140edbc3f47738 +Subproject commit dafd417d0b601da926408f16a5e6fa341a54405b diff --git a/tests/preprocessor b/tests/preprocessor index b87380457..cab4e6ceb 160000 --- a/tests/preprocessor +++ b/tests/preprocessor @@ -1 +1 @@ -Subproject commit b87380457e84b3a35cf9455857e7bbbdc3a56fc4 +Subproject commit cab4e6ceb15c8b0694073f914ee0599e370bc2f3