Dylan K. Taylor
28c787371a
Server::$rcon may be null (disabled or failed to start)
2020-02-03 19:25:56 +00:00
Dylan K. Taylor
dba14c9f08
PharPluginLoader: remove useless instanceof, offset is always PharFileInfo at this point
2020-02-03 12:35:34 +00:00
Dylan K. Taylor
0e35ee8cb7
build/server-phar: drop unused imports
2020-02-03 11:18:21 +00:00
Dylan K. Taylor
da5b7f47df
build/server-phar: import global functions
2020-02-03 11:17:51 +00:00
Dylan K. Taylor
d418dd7a09
build/make-release: fix formatting
2020-02-03 11:17:16 +00:00
Dylan K. Taylor
f3209ccc33
build/make-release: remove unused import
2020-02-03 11:16:51 +00:00
Dylan K. Taylor
4a4c28cd8c
travis.sh: ditch PHP_BINARY variable, use PATH prefix instead
...
this is how normal people do it ...
2020-02-03 09:30:43 +00:00
Dylan K. Taylor
eba8d77034
3.11.6 is next
2020-02-02 18:31:51 +00:00
Dylan K. Taylor
13e4772f98
Release 3.11.5
3.11.5
2020-02-02 18:31:51 +00:00
Dylan K. Taylor
092933105a
Merge branch 'stable'
2020-02-02 18:14:51 +00:00
Dylan K. Taylor
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
Dylan K. Taylor
afeb9838e4
Merge branch 'stable'
2020-02-02 16:47:19 +00:00
Dylan K. Taylor
663469dfa7
travis: remove xdebug to improve build time
...
xdebug is almost completely useless here.
2020-02-02 16:30:00 +00:00
Dylan K. Taylor
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
Dylan K. Taylor
1f2fb73297
updated DevTools submodule to 1.14.0
2020-02-02 10:21:32 +00:00
Dylan K. Taylor
7cb363d6e7
Merge branch 'stable'
2020-02-01 23:00:07 +00:00
Dylan K. Taylor
1b50a2d8d4
updated composer dependencies
2020-02-01 22:59:52 +00:00
Dylan K. Taylor
ff55b520b9
updated composer dependencies
2020-02-01 22:55:27 +00:00
Dylan K. Taylor
3df9aaa916
Merge branch 'stable'
2020-02-01 22:19:34 +00:00
Dylan K. Taylor
cedd8abf0c
README: no need to specify 'community' Discord [ci skip]
2020-02-01 22:19:24 +00:00
Dylan K. Taylor
80dc0eb8b8
rename BedrockData submodule
2020-02-01 22:14:53 +00:00
Dylan K. Taylor
d48597ec5d
move BedrockData submodule to resources/
2020-02-01 22:14:24 +00:00
Dylan K. Taylor
aad1a3400f
Merge branch 'submodule-conflict-stable' into submodule-conflict-master
2020-02-01 22:13:43 +00:00
Dylan K. Taylor
496732999c
reintroduce BedrockData submodule
2020-02-01 22:05:07 +00:00
Dylan K. Taylor
fed03fd535
Merge branch 'submodule-conflict-stable' into submodule-conflict-master
2020-02-01 22:02:44 +00:00
Dylan K. Taylor
6a8105f5a0
delete BedrockData submodule
2020-02-01 22:01:22 +00:00
Dylan K. Taylor
e3833ba4f0
Merge branch 'stable'
2020-02-01 21:03:21 +00:00
Dylan K. Taylor
b59dc1ef16
Merge commit 'b11c350b2b0b0cd38114e4240e056c3aa2028707'
...
# Conflicts:
# composer.json
# composer.lock
# resources/vanilla
2020-02-01 21:00:03 +00:00
Dylan K. Taylor
c19b21db91
Merge commit 'f624e36faf2214fef76ad3b7148c17f7f7ff641f'
2020-02-01 20:59:23 +00:00
Dylan K. Taylor
e8f31adc02
Merge commit '14ce9c10bb0895974008d415a3fb66ead1ab2361'
2020-02-01 20:55:31 +00:00
Dylan K. Taylor
54604398f2
Merge commit 'f1083bd9c402c1456f4fc7dce8271c33360dc227'
2020-02-01 20:54:54 +00:00
Dylan K. Taylor
38b7a9b76b
Merge commit '199fa61aef50ee731bbf08e23616b6087e267992'
2020-02-01 20:54:27 +00:00
Dylan K. Taylor
356ed5f1de
DyeColor: fix PHP 7.2 compatibility
2020-02-01 20:50:16 +00:00
Dylan K. Taylor
f02f45f248
Merge commit 'af82a6bbe1e4c37564ce1e0932a8177d31750b7d'
2020-02-01 20:45:16 +00:00
Dylan K. Taylor
269066b2d0
added unit test for Enum lazy initialization
2020-02-01 20:42:04 +00:00
Dylan K. Taylor
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
Dylan K. Taylor
cc33c8155f
Language: specify key type for lang and fallbackLang fields
2020-02-01 20:20:39 +00:00
Dylan K. Taylor
ff63f6d055
fill in more iterable types (master)
2020-02-01 20:19:57 +00:00
Dylan K. Taylor
0a566f8218
LevelProvider::generate() accepts class-string<Generator>, not any
...
string
2020-02-01 20:16:05 +00:00
Dylan K. Taylor
829dd02eea
Server: fixed more bad non-nullable phpdocs
2020-02-01 19:30:47 +00:00
Dylan K. Taylor
200209b76c
RegistryTrait: provide an explicit phpstan type for __callStatic arguments
2020-02-01 17:20:36 +00:00
Dylan K. Taylor
3688f78986
Merge commit '004f7ef82e9613d60c3614dbf634836b7e2f3774'
2020-01-31 22:09:20 +00:00
Dylan K. Taylor
c372f27e06
Empty merge of commit '89ebd2b88049d264cfa94543520f3af6e303a071'
2020-01-31 22:08:40 +00:00
Dylan K. Taylor
89c6da13ac
phpstan: use more class-string
2020-01-31 22:05:33 +00:00
Dylan K. Taylor
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
Dylan K. Taylor
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
Dylan K. Taylor
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
Dylan K. Taylor
ee4757303b
Merge commit '9eebfa7cc30c8a5ac39f192c79023131623ad4b4'
...
# Conflicts:
# resources/vanilla
# src/Server.php
# src/pocketmine/Achievement.php
2020-01-31 20:07:21 +00:00
Dylan K. Taylor
721bd8f02b
Merge commit 'd3021c628134293c2b8af505806efc2fba4fe947'
...
# Conflicts:
# resources/vanilla
2020-01-31 20:03:27 +00:00
Dylan K. Taylor
3401504bab
Merge commit '9097d6c4d35b05576181f91bda68d316809f28b9'
...
# Conflicts:
# resources/vanilla
2020-01-31 20:02:59 +00:00