mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-04 17:06:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/stable'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/world/Explosion.php
#	tests/phpunit/item/ItemTest.php
#	tests/phpunit/world/format/io/region/RegionLoaderTest.php
#	tests/plugins/TesterPlugin/src/pmmp/TesterPlugin/tests/AsyncTaskMainLoggerTest.php
#	tests/plugins/TesterPlugin/src/pmmp/TesterPlugin/tests/AsyncTaskMemoryLeakTest.php
This commit is contained in:
Dylan K. Taylor
2020-11-01 14:21:47 +00:00
parent c312c8ddd6 deb0cee8a0
commit 73a8c90bee
10 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/phpunit/network/mcpe/handler/StupidJsonDecodeTest.php
View File

@ -57,7 +57,6 @@ class StupidJsonDecodeTest extends TestCase{
/**
* @dataProvider stupidJsonDecodeProvider
*
* @param string $brokenJson
* @param mixed $expect
*
* @throws \ReflectionException