From 2822465f339a1494fb07e1c09e263e14de611368 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 7 Feb 2019 16:20:45 +0000 Subject: [PATCH 1/3] Updated submodules --- src/pocketmine/lang/locale | 2 +- tests/plugins/PocketMine-DevTools | 2 +- tests/preprocessor | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pocketmine/lang/locale b/src/pocketmine/lang/locale index 1d525a7c1..5dad5db21 160000 --- a/src/pocketmine/lang/locale +++ b/src/pocketmine/lang/locale @@ -1 +1 @@ -Subproject commit 1d525a7c1c268e34eaa9763803ee43517d51c161 +Subproject commit 5dad5db214ce0c94be0235e93d8253d0aec19c82 diff --git a/tests/plugins/PocketMine-DevTools b/tests/plugins/PocketMine-DevTools index 3f14ab5bb..c0f0f9383 160000 --- a/tests/plugins/PocketMine-DevTools +++ b/tests/plugins/PocketMine-DevTools @@ -1 +1 @@ -Subproject commit 3f14ab5bb7fac01a7459deed6ac7fa5eb7fb79f3 +Subproject commit c0f0f9383d27d0efb2c1d04ea3678beb6a14d3af 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 From 768cfe3953c2c43d823aa1c06d065f916f35f24c Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 7 Feb 2019 16:47:16 +0000 Subject: [PATCH 2/3] Updated composer dependencies --- composer.json | 2 +- composer.lock | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index 86d4b0cf6..aa33b9a97 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "pocketmine/raklib": "^0.12.0", "pocketmine/spl": "^0.3.0", "pocketmine/binaryutils": "^0.1.0", - "pocketmine/nbt": "^0.2.1", + "pocketmine/nbt": "^0.2.6", "pocketmine/math": "^0.2.0", "pocketmine/snooze": "^0.1.0", "daverandom/callback-validator": "dev-master", diff --git a/composer.lock b/composer.lock index 9f4f4ffd5..32846cebf 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d3fb809caf4d5a5c99054f47f28ff271", + "content-hash": "2f5313e4ebd7b62c785cf683b27464b4", "packages": [ { "name": "adhocore/json-comment", @@ -160,16 +160,16 @@ }, { "name": "pocketmine/nbt", - "version": "0.2.5", + "version": "0.2.6", "source": { "type": "git", "url": "https://github.com/pmmp/NBT.git", - "reference": "0b290fa0f5b44835ebeea8146c9ac960cac833f5" + "reference": "92eaf84dd61f700d3ec02ebd01b606cb5b1590d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/NBT/zipball/0b290fa0f5b44835ebeea8146c9ac960cac833f5", - "reference": "0b290fa0f5b44835ebeea8146c9ac960cac833f5", + "url": "https://api.github.com/repos/pmmp/NBT/zipball/92eaf84dd61f700d3ec02ebd01b606cb5b1590d4", + "reference": "92eaf84dd61f700d3ec02ebd01b606cb5b1590d4", "shasum": "" }, "require": { @@ -194,23 +194,23 @@ ], "description": "PHP library for working with Named Binary Tags", "support": { - "source": "https://github.com/pmmp/NBT/tree/0.2.5", + "source": "https://github.com/pmmp/NBT/tree/0.2.6", "issues": "https://github.com/pmmp/NBT/issues" }, - "time": "2019-01-07T17:28:16+00:00" + "time": "2019-02-07T16:28:11+00:00" }, { "name": "pocketmine/raklib", - "version": "0.12.1", + "version": "0.12.2", "source": { "type": "git", "url": "https://github.com/pmmp/RakLib.git", - "reference": "334b469f2d0f070f17902d7ac584bea7c6149dc6" + "reference": "54a36d55eeba0a182e00439920ee2fcfa8c72bf3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/RakLib/zipball/334b469f2d0f070f17902d7ac584bea7c6149dc6", - "reference": "334b469f2d0f070f17902d7ac584bea7c6149dc6", + "url": "https://api.github.com/repos/pmmp/RakLib/zipball/54a36d55eeba0a182e00439920ee2fcfa8c72bf3", + "reference": "54a36d55eeba0a182e00439920ee2fcfa8c72bf3", "shasum": "" }, "require": { @@ -235,10 +235,10 @@ ], "description": "A RakNet server implementation written in PHP", "support": { - "source": "https://github.com/pmmp/RakLib/tree/0.12.1", + "source": "https://github.com/pmmp/RakLib/tree/0.12", "issues": "https://github.com/pmmp/RakLib/issues" }, - "time": "2019-01-04T14:23:37+00:00" + "time": "2019-01-21T14:17:30+00:00" }, { "name": "pocketmine/snooze", From 1d0ffa06f8e424a3d4d0796c8b2eba4d7833ef5b Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 7 Feb 2019 16:55:25 +0000 Subject: [PATCH 3/3] TallGrass: fixed placement on dirt, closes #2552 --- src/pocketmine/block/TallGrass.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pocketmine/block/TallGrass.php b/src/pocketmine/block/TallGrass.php index b3e039557..7bcd619fa 100644 --- a/src/pocketmine/block/TallGrass.php +++ b/src/pocketmine/block/TallGrass.php @@ -51,8 +51,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(Vector3::SIDE_DOWN); - if($down->getId() === self::GRASS){ + $down = $this->getSide(Vector3::SIDE_DOWN)->getId(); + if($down === self::GRASS or $down === self::DIRT){ $this->getLevel()->setBlock($blockReplace, $this, true); return true;