11688 Commits

Author SHA1 Message Date
Dylan K. Taylor
81dff6d4c5 Merge branch 'next-minor' 2020-05-19 21:32:44 +01:00
Dylan K. Taylor
5b7a55660f Merge commit '786f416f2ef31726b9e6fa0a5edde36aecddf085'
# Conflicts:
#	resources/vanilla
#	src/plugin/PluginBase.php
#	src/utils/Utils.php
2020-05-19 21:19:44 +01:00
Dylan K. Taylor
5b82bd4fad Merge commit 'a67d2ae978ecae234c3e46b5ac0f8f0dc99e85a7'
# Conflicts:
#	resources/vanilla
#	src/pocketmine/item/Bow.php
2020-05-19 21:15:56 +01:00
Dylan K. Taylor
45ec4645d2 Merge commit '089180fef4534b383a31a9d560a76bfaf0d16c6b'
# Conflicts:
#	resources/vanilla
#	src/entity/Living.php
2020-05-19 21:14:54 +01:00
Dylan K. Taylor
da4a2d8552 Fixed a bunch of missed Position->getLevel() usages
these were not in the usage search because PhpStorm decided to refer to ChunkLoader->getLevel() for any Player references, which caused them to only show when that was searched.

There's also an undetected LSP violation with ChunkLoader because it requires returning Level and Position->getLevel() returns Level|null. I don't know why PHPStan doesn't complain about that.
2020-05-19 21:01:18 +01:00
Dylan K. Taylor
337addf1de Eradicate remaining usages of public Position->world field
and as an added bonus, ditch a bunch of extra phpstan errors
2020-05-19 19:14:56 +01:00
Dylan K. Taylor
8a8b1b0b97 Remove Position->setWorld() 2020-05-19 18:33:16 +01:00
Dylan K. Taylor
148228e360 update pocketmine/math, adapt to add() changes 2020-05-19 12:26:18 +01:00
Dylan K. Taylor
dc9351b024 Merge remote-tracking branch 'origin/stable' into next-minor 2020-05-19 11:26:25 +01:00
SOFe
786f416f2e
Improved support for paths with backslashes on Unix filesystems (#3501)
Fixes #3497
2020-05-19 10:34:51 +01:00
Drew
a67d2ae978
parity: burning players no longer shoot burning arrows (#3509)
this behaviour doesn't exist in vanilla.
2020-05-19 10:31:39 +01:00
Drew
089180fef4
Players no longer burn when hit by other players, closes #3170 (#3470) 2020-05-18 21:13:56 +01:00
Dylan K. Taylor
f0fefecf40 updated l7 and l8 baselines for master 2020-05-18 20:36:50 +01:00
Dylan K. Taylor
55f8314fa7 Merge branch 'next-minor'
# Conflicts:
#	resources/vanilla
2020-05-18 20:33:22 +01:00
Dylan K. Taylor
232ff838db Merge commit '22b5de09b476a8c1638adfaba56b210c1eb1faf0'
# Conflicts:
#	resources/vanilla
#	src/pocketmine/level/particle/InstantEnchantParticle.php
#	src/world/sound/ExplodeSound.php
2020-05-18 20:30:00 +01:00
Dylan K. Taylor
ba0dcdb722 Merge commit '71a8b0340c303a4d2c024ad5a0a558c5e52694e7'
# Conflicts:
#	resources/vanilla
2020-05-18 20:18:47 +01:00
Dylan K. Taylor
15baf09339 update l7 and l8 baselines for next-minor branch 2020-05-18 20:16:03 +01:00
Dylan K. Taylor
083dde8395 Merge branch 'stable' into next-minor 2020-05-18 20:10:47 +01:00
Dylan K. Taylor
fffa4b9501 phpstan: baseline our way to level 8
we really need the level 8 checks on new code now, and waiting until old code is clean is not going to benefit us much because the issues that are there already exist.
2020-05-18 20:09:25 +01:00
Dylan K. Taylor
22b5de09b4 added colours to EnchantParticle and InstantEnchantParticle, closes #3368 2020-05-18 20:00:51 +01:00
Dylan K. Taylor
71a8b0340c BUILDING.md: EOF newline [ci skip] 2020-05-18 19:23:18 +01:00
padreon
e544055bbc BUILDING.md: change build/server.phar to build/server-phar.php
closes #3507
2020-05-18 18:54:14 +01:00
Dylan K. Taylor
22425551ed separate default attribute creation from Attribute into AttributeMap 2020-05-18 18:12:04 +01:00
Dylan K. Taylor
07f979fbde RuntimeBlockMapping: bedrockKnownStates is never null 2020-05-18 17:54:27 +01:00
Dylan K. Taylor
486ce140d8 PacketBatch no longer extends NetworkBinaryStream
this removes a whole bunch of crap from its API that shouldn't have been exposed. In the future we should look at splitting this into reader/writer halves, but for now this is a step in the right direction.
2020-05-18 17:35:30 +01:00
Twisted
8f5db7c297
3.12.2 changelog typo (#3505) 2020-05-18 12:26:07 +01:00
Dylan K. Taylor
e96b082a54 RegistryTrait: fixing use of method that doesn't belong to the trait 2020-05-18 11:40:02 +01:00
Dylan K. Taylor
a91e895781 Merge branch 'next-minor'
# Conflicts:
#	resources/vanilla
#	src/VersionInfo.php
2020-05-18 10:54:39 +01:00
Dylan K. Taylor
ca0d92ac59 Merge commit '1fb0ba6fc051a3052bf6ef8a84db31f85cfd4313' 2020-05-18 10:52:44 +01:00
Dylan K. Taylor
dec500bbdd Merge commit '9ebd6d6b0fee486e1cb935cc7b5376d27ca99fd4'
# Conflicts:
#	resources/vanilla
2020-05-18 10:48:58 +01:00
Dylan K. Taylor
58fb185e05 Merge commit '58e32086c04d6622c01f59d0cd7216bd8a50eddb'
# Conflicts:
#	resources/vanilla
#	src/world/World.php
2020-05-18 10:47:37 +01:00
Dylan K. Taylor
3c367c70cd update build/php submodule to pmmp/php-build-scripts@8084604600 2020-05-18 10:44:29 +01:00
Dylan K. Taylor
af253d196d Merge commit 'f1d378468ecccb7bb03ed5d4e5729558c2beda3c' 2020-05-18 10:42:16 +01:00
Dylan K. Taylor
0e7a822553 Merge commit '25fb5140a2dba99c5e076849ac11e051a2970807' 2020-05-18 10:40:07 +01:00
Dylan K. Taylor
8d49bc93e0 Merge commit 'f5a49b6d55940584a6a4e9cdbc456c581182b5fd'
# Conflicts:
#	resources/vanilla
2020-05-18 10:35:23 +01:00
Dylan K. Taylor
fb58959d5f Merge commit '189f12a644aa6474bc91650cce0eb0ae9735db91'
# Conflicts:
#	resources/vanilla
2020-05-18 10:34:00 +01:00
Dylan K. Taylor
eeec775ff6 Merge commit '5a8917f6f21205d074ce3e9d2f9325e427f9d254'
# Conflicts:
#	resources/vanilla
2020-05-18 10:32:20 +01:00
Dylan K. Taylor
4520660025 Merge commit 'f3e436592a180c8d4fbcd346a97abdd746056c38'
# Conflicts:
#	resources/vanilla
2020-05-18 10:30:55 +01:00
Dylan K. Taylor
38d67620f6 Merge commit '35747874f6b9b0a35ad06ec4919df5956e6b8e91' 2020-05-18 10:29:45 +01:00
Dylan K. Taylor
76d41e7695 Merge commit '59445902b8c1fbd2bd738c69132d8a4dac3d6c5f' 2020-05-18 10:29:31 +01:00
Dylan K. Taylor
3795a13683 Merge commit '2eb62c85f69ebd22b36f29cfb513a579ea570b0c'
# Conflicts:
#	resources/vanilla
#	src/Server.php
2020-05-18 10:29:06 +01:00
Dylan K. Taylor
d6b03e03bf Merge commit 'ad2a39bf13e7ed6a84a7973aed686eba2d70e417' 2020-05-18 10:27:14 +01:00
Dylan K. Taylor
a5edfa368e Merge branch 'stable' into next-minor 2020-05-18 10:25:25 +01:00
Dylan K. Taylor
27f55e4c96 3.12.3 is next 2020-05-18 10:17:08 +01:00
Dylan K. Taylor
9b6b3f50a1 Release 3.12.2 3.12.2 2020-05-18 10:17:02 +01:00
Dylan K. Taylor
1fb0ba6fc0 travis: update PHP extension versions 2020-05-18 09:47:56 +01:00
Dylan K. Taylor
f1d378468e updated build/php submodule to pmmp/php-build-scripts@a6ab41089e 2020-05-18 09:44:43 +01:00
Dylan K. Taylor
9ebd6d6b0f Timezone: remove rogue newline 2020-05-17 14:03:22 +01:00
Dylan K. Taylor
65f82f5cdf Task::onRun() and Task::onCancel() now require :void return typehints 2020-05-17 13:58:01 +01:00
XenialDan
58e32086c0
Level: Updated TIME_* constants (#3385)
- Added Level::TIME_NOON
- Added Level::TIME_MIDNIGHT
- Changed values of Level::TIME_DAY and Level::TIME_NIGHT
2020-05-17 10:10:35 +01:00