092933105a
Merge branch 'stable'
2020-02-02 18:14:51 +00:00
4bc2f28c6d
Provide a ChunkUtils stub for PHPStan, so it doesn't get confused when the extension is loaded
...
for some reason the presence of the type problems were reported as
problems on ChunkUtils.php, despite being outside of the project scope
and the errors not applying to the polyfill.
2020-02-02 18:12:41 +00:00
afeb9838e4
Merge branch 'stable'
2020-02-02 16:47:19 +00:00
663469dfa7
travis: remove xdebug to improve build time
...
xdebug is almost completely useless here.
2020-02-02 16:30:00 +00:00
963abb718f
build/server-phar: compress using gzip (except stub)
...
this produces a 75% reduction in phar size, at the expense of a slight degradation of autoloading speed and needing a writable tmpdir.
2020-02-02 16:27:38 +00:00
1f2fb73297
updated DevTools submodule to 1.14.0
2020-02-02 10:21:32 +00:00
7cb363d6e7
Merge branch 'stable'
2020-02-01 23:00:07 +00:00
1b50a2d8d4
updated composer dependencies
2020-02-01 22:59:52 +00:00
ff55b520b9
updated composer dependencies
2020-02-01 22:55:27 +00:00
3df9aaa916
Merge branch 'stable'
2020-02-01 22:19:34 +00:00
cedd8abf0c
README: no need to specify 'community' Discord [ci skip]
2020-02-01 22:19:24 +00:00
80dc0eb8b8
rename BedrockData submodule
2020-02-01 22:14:53 +00:00
d48597ec5d
move BedrockData submodule to resources/
2020-02-01 22:14:24 +00:00
aad1a3400f
Merge branch 'submodule-conflict-stable' into submodule-conflict-master
2020-02-01 22:13:43 +00:00
496732999c
reintroduce BedrockData submodule
2020-02-01 22:05:07 +00:00
fed03fd535
Merge branch 'submodule-conflict-stable' into submodule-conflict-master
2020-02-01 22:02:44 +00:00
6a8105f5a0
delete BedrockData submodule
2020-02-01 22:01:22 +00:00
e3833ba4f0
Merge branch 'stable'
2020-02-01 21:03:21 +00:00
b59dc1ef16
Merge commit 'b11c350b2b0b0cd38114e4240e056c3aa2028707'
...
# Conflicts:
# composer.json
# composer.lock
# resources/vanilla
2020-02-01 21:00:03 +00:00
c19b21db91
Merge commit 'f624e36faf2214fef76ad3b7148c17f7f7ff641f'
2020-02-01 20:59:23 +00:00
e8f31adc02
Merge commit '14ce9c10bb0895974008d415a3fb66ead1ab2361'
2020-02-01 20:55:31 +00:00
54604398f2
Merge commit 'f1083bd9c402c1456f4fc7dce8271c33360dc227'
2020-02-01 20:54:54 +00:00
38b7a9b76b
Merge commit '199fa61aef50ee731bbf08e23616b6087e267992'
2020-02-01 20:54:27 +00:00
356ed5f1de
DyeColor: fix PHP 7.2 compatibility
2020-02-01 20:50:16 +00:00
f02f45f248
Merge commit 'af82a6bbe1e4c37564ce1e0932a8177d31750b7d'
2020-02-01 20:45:16 +00:00
269066b2d0
added unit test for Enum lazy initialization
2020-02-01 20:42:04 +00:00
9c33ea8dd1
EnumTrait: use a better method to initialize enums
...
this method is simpler, and is also safe at the native type level.
Coincidentally, it also eliminates 30 PHPStan false-positives.
2020-02-01 20:33:30 +00:00
cc33c8155f
Language: specify key type for lang and fallbackLang fields
2020-02-01 20:20:39 +00:00
ff63f6d055
fill in more iterable types (master)
2020-02-01 20:19:57 +00:00
0a566f8218
LevelProvider::generate() accepts class-string<Generator>, not any
...
string
2020-02-01 20:16:05 +00:00
829dd02eea
Server: fixed more bad non-nullable phpdocs
2020-02-01 19:30:47 +00:00
200209b76c
RegistryTrait: provide an explicit phpstan type for __callStatic arguments
2020-02-01 17:20:36 +00:00
3688f78986
Merge commit '004f7ef82e9613d60c3614dbf634836b7e2f3774'
2020-01-31 22:09:20 +00:00
c372f27e06
Empty merge of commit '89ebd2b88049d264cfa94543520f3af6e303a071'
2020-01-31 22:08:40 +00:00
89c6da13ac
phpstan: use more class-string
2020-01-31 22:05:33 +00:00
f65bf76fd8
Merge commit '799183e13e61e89cc6820ad3132a4147454017c6'
...
# Conflicts:
# resources/vanilla
# src/Server.php
# src/pocketmine/entity/Entity.php
# src/pocketmine/level/format/io/LevelProviderManager.php
# src/pocketmine/tile/Tile.php
# src/world/generator/GeneratorManager.php
2020-01-31 21:26:40 +00:00
cb16f5c142
Merge commit '260ac47588c76a2e6814cfba46773a990fb8c5da'
...
# Conflicts:
# resources/vanilla
# src/Server.php
# src/lang/Language.php
# src/network/mcpe/protocol/AddItemActorPacket.php
# src/network/mcpe/protocol/AddPlayerPacket.php
# src/network/mcpe/protocol/SetActorDataPacket.php
# src/network/mcpe/serializer/NetworkBinaryStream.php
# src/permission/Permission.php
# src/pocketmine/block/Leaves.php
# src/pocketmine/entity/DataPropertyManager.php
# src/pocketmine/entity/Entity.php
# src/pocketmine/item/Banner.php
# src/pocketmine/item/Item.php
# src/pocketmine/level/format/io/LevelProvider.php
# src/pocketmine/level/format/io/LevelProviderManager.php
# src/pocketmine/network/mcpe/protocol/AddActorPacket.php
# src/pocketmine/network/mcpe/protocol/LoginPacket.php
# src/pocketmine/tile/Banner.php
# src/scheduler/BulkCurlTask.php
# src/updater/AutoUpdater.php
# src/utils/Config.php
# src/utils/Utils.php
# src/world/generator/Flat.php
# src/world/generator/Generator.php
2020-01-31 21:07:34 +00:00
96ac95798b
Merge commit '4ff4434a220813e446efde4a38e48a0416476dba'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/item/Banner.php
# src/pocketmine/item/Item.php
2020-01-31 20:11:29 +00:00
ee4757303b
Merge commit '9eebfa7cc30c8a5ac39f192c79023131623ad4b4'
...
# Conflicts:
# resources/vanilla
# src/Server.php
# src/pocketmine/Achievement.php
2020-01-31 20:07:21 +00:00
721bd8f02b
Merge commit 'd3021c628134293c2b8af505806efc2fba4fe947'
...
# Conflicts:
# resources/vanilla
2020-01-31 20:03:27 +00:00
3401504bab
Merge commit '9097d6c4d35b05576181f91bda68d316809f28b9'
...
# Conflicts:
# resources/vanilla
2020-01-31 20:02:59 +00:00
3a68f5e3d0
Merge commit 'da43ae82fe3b8839a4d153b0365f815cf9859d77'
...
# Conflicts:
# resources/vanilla
# src/utils/Config.php
# src/utils/Timezone.php
# src/utils/Utils.php
2020-01-31 20:02:39 +00:00
3e80850938
Merge commit '60b405d944254c940f818ebd0b7aa2603d7968a7'
...
# Conflicts:
# resources/vanilla
# src/updater/AutoUpdater.php
2020-01-31 19:55:43 +00:00
1ae7960fc4
Merge commit '92a752053df598e5fe9366601bef070d967374fc'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/tile/Banner.php
# src/pocketmine/tile/Sign.php
# src/pocketmine/tile/Tile.php
2020-01-31 19:50:33 +00:00
9b9b955762
Merge commit '0537c66849b307465159306981bad78ba902f30b'
...
# Conflicts:
# resources/vanilla
# src/scheduler/BulkCurlTask.php
2020-01-31 19:47:59 +00:00
19a6fb35e7
Merge commit 'd94995e161d71659e2fe6ec1df47621f2de4b494'
...
# Conflicts:
# resources/vanilla
2020-01-31 19:46:28 +00:00
b46712fbe9
Merge commit '58bc08838ba18df6361cede4b420d87d5973090a'
...
# Conflicts:
# resources/vanilla
# src/permission/Permission.php
2020-01-31 19:45:31 +00:00
20d39846b7
Merge commit 'fc0619ee6e4fa08aba2719e58a9289edd11f0b6e'
...
# Conflicts:
# resources/vanilla
# src/network/mcpe/protocol/AddItemActorPacket.php
# src/network/mcpe/protocol/AddPlayerPacket.php
# src/network/mcpe/protocol/SetActorDataPacket.php
# src/network/mcpe/serializer/NetworkBinaryStream.php
# src/pocketmine/network/mcpe/protocol/AddActorPacket.php
# src/pocketmine/network/mcpe/protocol/LoginPacket.php
2020-01-31 19:42:07 +00:00
465d8cda79
Merge commit 'a5764b3ae98a70fe8f20f9b403a4ab84b51b11d8'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/level/format/io/LevelProvider.php
# src/world/generator/Generator.php
# src/world/generator/GeneratorRegisterTask.php
2020-01-31 19:32:38 +00:00
301460a0ea
Merge commit '8bf469f7fcd428ebc8c3c9b9ab777c79e2824c67'
...
# Conflicts:
# resources/vanilla
# src/lang/Language.php
2020-01-31 19:22:14 +00:00
