465285b3c2
do not rely on GameMode::getMagicNumber() to match protocol IDs
2020-06-13 12:26:17 +01:00
5c16261374
Merge branch 'stable'
2020-06-13 11:59:05 +01:00
f0669b7770
Merge commit '710c16260'
...
# Conflicts:
# resources/vanilla
# src/network/query/QueryInfo.php
2020-06-13 11:59:00 +01:00
5a8633f6c0
Merge commit '409c8c170'
...
# Conflicts:
# resources/vanilla
2020-06-13 11:57:58 +01:00
3bf47e33f0
Merge commit '376926c70'
...
# Conflicts:
# resources/vanilla
# src/command/defaults/TimingsCommand.php
2020-06-13 11:57:31 +01:00
fab46f159b
Merge commit 'c3fabe833'
2020-06-13 11:56:26 +01:00
430806cab3
Merge commit '3e09ff535'
...
# Conflicts:
# resources/vanilla
# src/block/tile/EnchantTable.php
2020-06-13 11:56:11 +01:00
0d186fe42c
Merge commit '725506510'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/level/format/io/leveldb/LevelDB.php
2020-06-13 11:55:10 +01:00
dba059d8da
Merge commit 'a7f10d8cc'
...
# Conflicts:
# resources/vanilla
2020-06-13 11:52:17 +01:00
70ca12bb90
Merge commit 'fcc9e62c6'
...
# Conflicts:
# resources/vanilla
# src/network/mcpe/protocol/types/command/CommandEnum.php
# src/pocketmine/Player.php
2020-06-13 11:49:52 +01:00
ee6b980b98
Merge commit '42613618a'
...
# Conflicts:
# phpstan.neon.dist
# resources/vanilla
2020-06-13 11:46:39 +01:00
f3271a0d19
Merge commit '1bbeb6245'
...
# Conflicts:
# composer.lock
# resources/vanilla
2020-06-13 11:44:44 +01:00
fe1b5d2d01
Merge commit '3d50aafcc'
...
# Conflicts:
# resources/vanilla
# src/crafting/ShapedRecipe.php
2020-06-13 11:30:44 +01:00
4208192aa2
Merge commit '50fed4164'
...
# Conflicts:
# resources/vanilla
2020-06-13 11:29:39 +01:00
69aa6a51b4
Merge commit '3f971a0c6'
...
# Conflicts:
# resources/vanilla
# tests/phpstan/configs/l7-baseline.neon
2020-06-13 11:29:12 +01:00
da3ba1e2b2
Merge commit 'a27b29897'
...
# Conflicts:
# resources/vanilla
2020-06-13 11:28:03 +01:00
2a9498a4f9
Merge commit 'a90132a30'
...
# Conflicts:
# resources/vanilla
2020-06-13 11:22:18 +01:00
d82264fe60
Merge commit 'dfbd85777'
...
# Conflicts:
# resources/vanilla
# src/VersionInfo.php
2020-06-13 11:21:43 +01:00
586f265033
update build/php submodule to pmmp/php-build-scripts@2f422db397
2020-06-13 11:17:58 +01:00
a219b727f2
updated build/php submodule to pmmp/php-build-scripts@cec63c3093
2020-06-13 11:14:21 +01:00
710c162604
QueryRegenerateEvent: fixed possible type violation on listPlugins
2020-06-10 12:11:39 +01:00
409c8c1703
TimingsCommand: workaround a PHPStan type specifying bug
2020-06-10 12:11:10 +01:00
376926c700
TimingsCommand: fix missing type information for async task local storage
2020-06-10 12:10:33 +01:00
c3fabe833e
FileWriteTask: mark as deprecated
2020-06-10 11:22:18 +01:00
3e09ff5350
EnchantTable: fix formatting issue [ci skip]
2020-06-10 10:54:22 +01:00
7255065106
LevelDB: stop passing false to places where it's not expected
2020-06-10 10:45:54 +01:00
a7f10d8ccf
phpstan: ignore a FP (fixed in 0.12.26, but we can't upgrade yet)
2020-06-10 10:45:28 +01:00
76f1add3b3
Timezone: return false if date_parse() fails
...
I hate this, but I don't want to change it to throw right now because it'll create a bunch of extra work.
2020-06-10 10:34:34 +01:00
fcc9e62c65
CommandEnum: specify enumValues type
...
phpstan 0.12.26 starts reporting errors about the result of array_search() being given to some constructor or another because of the lack of key type specification.
2020-06-10 10:33:35 +01:00
42613618a5
phpstan: add LevelDB::get() stub to fix return type
2020-06-10 10:31:54 +01:00
1bbeb62457
Bump phpunit/phpunit from 9.2.1 to 9.2.2 ( #3566 )
2020-06-08 17:32:39 +00:00
64893426fa
Bump phpunit/phpunit from 8.5.5 to 9.2.1 ( #3557 )
2020-06-06 10:13:46 +00:00
3d50aafcc4
ShapedRecipe: remove a curly-brace array-access that nothing noticed
2020-06-06 11:12:45 +01:00
50fed41642
README: we're now on travis-ci.com
2020-06-05 13:02:31 +01:00
3f971a0c65
phpstan: fixed analyze failure caused by a27b29897c
2020-06-05 12:58:18 +01:00
a27b29897c
TimingsCommand: tell operators what's going on for audit purposes
...
previously nobody except the person who was managing timings would know that timings was running, being pasted or whatever else. Since timings can impact performance (and, for example, block the main thread when writing timings to a file), access to it should be logged so that server owners know what's going on.
2020-06-05 11:12:36 +01:00
a90132a30e
added missing 3.12.6 changelog
2020-06-04 20:38:06 +01:00
dfbd857771
3.13.1 is next
2020-06-04 20:01:28 +01:00
323d96d5c1
Release 3.13.0
2020-06-04 20:01:27 +01:00
f495ba1d0b
Merge branch 'next-minor' into stable
2020-06-04 19:59:46 +01:00
643cf0ebf8
3.12.7 is next
2020-06-04 19:55:09 +01:00
1614206a6d
Release 3.12.6
2020-06-04 19:55:09 +01:00
f3bcd04e87
update build/php submodule to pmmp/php-build-scripts@fd749b299a
2020-06-04 14:16:45 +01:00
b8e57282e3
Merge branch 'next-minor'
...
# Conflicts:
# resources/vanilla
2020-06-04 14:14:09 +01:00
2affdc1af2
Merge commit '00916ade0'
2020-06-04 14:13:52 +01:00
c29ed34b54
Merge commit 'f4ee2912db89c6629d4fa191e993f0798035ef20'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/Server.php
2020-06-04 14:13:23 +01:00
0a3bd6fe78
Merge commit 'a0de9b0d4'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/Player.php
2020-06-04 14:11:00 +01:00
fcc2352203
Merge commit '03e8cd3ed'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/Player.php
2020-06-04 14:07:55 +01:00
3e9018a838
Merge commit '7af4e70f6'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/entity/Entity.php
2020-06-04 14:02:00 +01:00
0ae2c6302a
Merge branch 'stable' into next-minor
2020-06-04 13:59:30 +01:00
