11883 Commits

Author SHA1 Message Date
Dylan K. Taylor
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
Dylan K. Taylor
ee6b980b98 Merge commit '42613618a'
# Conflicts:
#	phpstan.neon.dist
#	resources/vanilla
2020-06-13 11:46:39 +01:00
Dylan K. Taylor
f3271a0d19 Merge commit '1bbeb6245'
# Conflicts:
#	composer.lock
#	resources/vanilla
2020-06-13 11:44:44 +01:00
Dylan K. Taylor
fe1b5d2d01 Merge commit '3d50aafcc'
# Conflicts:
#	resources/vanilla
#	src/crafting/ShapedRecipe.php
2020-06-13 11:30:44 +01:00
Dylan K. Taylor
4208192aa2 Merge commit '50fed4164'
# Conflicts:
#	resources/vanilla
2020-06-13 11:29:39 +01:00
Dylan K. Taylor
69aa6a51b4 Merge commit '3f971a0c6'
# Conflicts:
#	resources/vanilla
#	tests/phpstan/configs/l7-baseline.neon
2020-06-13 11:29:12 +01:00
Dylan K. Taylor
da3ba1e2b2 Merge commit 'a27b29897'
# Conflicts:
#	resources/vanilla
2020-06-13 11:28:03 +01:00
Dylan K. Taylor
2a9498a4f9 Merge commit 'a90132a30'
# Conflicts:
#	resources/vanilla
2020-06-13 11:22:18 +01:00
Dylan K. Taylor
d82264fe60 Merge commit 'dfbd85777'
# Conflicts:
#	resources/vanilla
#	src/VersionInfo.php
2020-06-13 11:21:43 +01:00
Dylan K. Taylor
586f265033 update build/php submodule to pmmp/php-build-scripts@2f422db397 2020-06-13 11:17:58 +01:00
Dylan K. Taylor
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
Dylan K. Taylor
42613618a5 phpstan: add LevelDB::get() stub to fix return type 2020-06-10 10:31:54 +01:00
dependabot-preview[bot]
1bbeb62457
Bump phpunit/phpunit from 9.2.1 to 9.2.2 (#3566) 2020-06-08 17:32:39 +00:00
dependabot-preview[bot]
64893426fa
Bump phpunit/phpunit from 8.5.5 to 9.2.1 (#3557) 2020-06-06 10:13:46 +00:00
Dylan K. Taylor
3d50aafcc4 ShapedRecipe: remove a curly-brace array-access that nothing noticed 2020-06-06 11:12:45 +01:00
Dylan T
50fed41642
README: we're now on travis-ci.com 2020-06-05 13:02:31 +01:00
Dylan K. Taylor
3f971a0c65 phpstan: fixed analyze failure caused by a27b29897c58ec91c497f9bd7cd6bedb64ce77b4 2020-06-05 12:58:18 +01:00
Dylan K. Taylor
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
Dylan K. Taylor
a90132a30e added missing 3.12.6 changelog 2020-06-04 20:38:06 +01:00
Dylan K. Taylor
dfbd857771 3.13.1 is next 2020-06-04 20:01:28 +01:00
Dylan K. Taylor
323d96d5c1 Release 3.13.0 3.13.0 2020-06-04 20:01:27 +01:00
Dylan K. Taylor
f495ba1d0b Merge branch 'next-minor' into stable 2020-06-04 19:59:46 +01:00
Dylan K. Taylor
643cf0ebf8 3.12.7 is next 2020-06-04 19:55:09 +01:00
Dylan K. Taylor
1614206a6d Release 3.12.6 3.12.6 2020-06-04 19:55:09 +01:00
Dylan K. Taylor
f3bcd04e87 update build/php submodule to pmmp/php-build-scripts@fd749b299a 2020-06-04 14:16:45 +01:00
Dylan K. Taylor
b8e57282e3 Merge branch 'next-minor'
# Conflicts:
#	resources/vanilla
2020-06-04 14:14:09 +01:00
Dylan K. Taylor
2affdc1af2 Merge commit '00916ade0' 2020-06-04 14:13:52 +01:00
Dylan K. Taylor
c29ed34b54 Merge commit 'f4ee2912db89c6629d4fa191e993f0798035ef20'
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Server.php
2020-06-04 14:13:23 +01:00
Dylan K. Taylor
0a3bd6fe78 Merge commit 'a0de9b0d4'
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
2020-06-04 14:11:00 +01:00
Dylan K. Taylor
fcc2352203 Merge commit '03e8cd3ed'
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
2020-06-04 14:07:55 +01:00
Dylan K. Taylor
3e9018a838 Merge commit '7af4e70f6'
# Conflicts:
#	resources/vanilla
#	src/pocketmine/entity/Entity.php
2020-06-04 14:02:00 +01:00
Dylan K. Taylor
0ae2c6302a Merge branch 'stable' into next-minor 2020-06-04 13:59:30 +01:00
Dylan K. Taylor
4f59c1b26c .gitignore: ignore some extra crap 2020-06-04 13:58:46 +01:00
Dylan K. Taylor
00916ade0c update build/php submodule to pmmp/php-build-scripts@0aa88d2765 2020-06-04 13:55:03 +01:00
Dylan K. Taylor
f4ee2912db Server: tell me what is wrong when crash archive submission fails 2020-06-04 13:48:40 +01:00
Dylan K. Taylor
a0de9b0d46 Player: use real time to update rate limit, fixes #3554 (except in very extreme cases) 2020-06-04 13:39:26 +01:00
Dylan K. Taylor
03e8cd3ed4 Player: fixing ground state handling in spectator mode, closes #3552, closes #3553 2020-06-04 11:10:21 +01:00
Dylan K. Taylor
7af4e70f64 Entity: fixed movement updates not firing after teleport
this became obvious by teleporting non-moving entities into the air and observing that they didn't fall.
2020-06-04 10:52:04 +01:00
Dylan K. Taylor
017afead3b extract FurnaceRecipeManager unit from CraftingManager
I'd like to have this directly provided to Furnace, but I don't know how to short of making into a singleton. Since I want to have per-furnace recipe managers (e.g. for stuff like blast furnace vs regular furnace etc), a singleton isn't really an option.
2020-06-03 18:59:59 +01:00
Dylan K. Taylor
b58c425189 Merge branch 'next-minor'
# Conflicts:
#	changelogs/3.12.md
#	resources/vanilla
#	src/VersionInfo.php
2020-06-03 13:11:30 +01:00
Dylan K. Taylor
0af5dbc89b Merge commit '3be83e09f' 2020-06-03 13:09:04 +01:00
Dylan K. Taylor
bce7cdd461 Merge commit 'f24be2b05'
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
#	src/pocketmine/block/SnowLayer.php
2020-06-03 13:08:48 +01:00
Dylan K. Taylor
a5e08e9a71 Merge commit '92cffc00d' 2020-06-03 13:06:02 +01:00
Dylan K. Taylor
c864647cd1 Merge branch 'stable' into next-minor 2020-06-03 13:04:08 +01:00
Dylan K. Taylor
d2d4780653 Merge commit 'a3f633862'
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
2020-06-03 13:03:23 +01:00
Dylan K. Taylor
7d7c16b764 Merge commit '21aef97ba'
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
2020-06-03 13:00:31 +01:00
Dylan K. Taylor
892fa1598d Merge commit 'ed0d1978a'
# Conflicts:
#	resources/vanilla
#	src/pocketmine/item/WritableBook.php
2020-06-03 12:58:57 +01:00
Dylan K. Taylor
01cbd27485 Merge commit 'd64561b0b'
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
2020-06-03 12:57:20 +01:00
Dylan K. Taylor
b2f182b196 Merge commit 'd234d3e45'
# Conflicts:
#	resources/vanilla
#	src/pocketmine/command/defaults/ParticleCommand.php
2020-06-03 12:55:46 +01:00
Dylan K. Taylor
90b53149d7 Merge commit '5056754ce'
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
2020-06-03 12:54:00 +01:00