544bcb8f12
Merge commit '0d4e473bd'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/Player.php
2020-06-03 12:45:28 +01:00
899da1b7f7
Merge commit '42e14f749'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/Player.php
# src/pocketmine/item/Bow.php
# src/world/World.php
2020-06-03 12:31:17 +01:00
6df43338df
Merge commit 'c3a795e87'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/Player.php
# src/pocketmine/entity/Entity.php
2020-05-31 14:56:37 +01:00
fe649d8d70
Extract ServerConfigGroup from Server
...
this API isn't very nice, but it's pretty much the same as the original, and at least this can be _kinda_ unit-tested...
2020-05-24 15:48:03 +01:00
3d0e47a86f
Merge branch 'next-minor'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/network/mcpe/protocol/StartGamePacket.php
2020-05-20 20:22:18 +01:00
12f53f0ae0
Merge commit 'a29424f5b'
...
# Conflicts:
# resources/vanilla
2020-05-20 20:21:29 +01:00
9421308f73
Merge commit '3a7873598'
...
# Conflicts:
# resources/vanilla
2020-05-20 20:19:42 +01:00
1318cfbe29
Merge commit 'ab32784c7'
...
# Conflicts:
# resources/vanilla
2020-05-20 20:18:57 +01:00
c14069c42b
Merge commit '816234a37'
...
# Conflicts:
# resources/vanilla
# src/network/mcpe/protocol/UpdateBlockSyncedPacket.php
2020-05-20 20:16:45 +01:00
14c7ab50d8
Merge commit 'b7bf92a5e'
...
# Conflicts:
# resources/vanilla
2020-05-20 20:15:15 +01:00
b6209ffe71
Merge commit 'dcca000ea'
...
# Conflicts:
# resources/vanilla
2020-05-20 20:14:58 +01:00
ca4f8501f6
Merge commit 'c4ea51f98'
...
# Conflicts:
# resources/vanilla
2020-05-20 20:14:33 +01:00
d2ee2d42f9
Merge commit '8202bb1cd'
...
# Conflicts:
# resources/vanilla
2020-05-20 20:14:01 +01:00
a34fbba4c8
Merge commit 'b75758e35'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/network/mcpe/protocol/MoveActorDeltaPacket.php
2020-05-20 20:13:28 +01:00
82bc59f480
Merge commit '38a06f76f'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/network/mcpe/protocol/LoginPacket.php
2020-05-20 20:11:43 +01:00
73495f303e
Merge commit '84f99ed41'
...
# Conflicts:
# resources/vanilla
2020-05-20 20:10:30 +01:00
8f6ccb17fd
Merge commit 'fd63f1919'
...
# Conflicts:
# resources/vanilla
# src/network/mcpe/protocol/serializer/NetworkBinaryStream.php
# src/pocketmine/network/mcpe/protocol/StartGamePacket.php
2020-05-20 20:09:54 +01:00
3bf52b3977
Merge commit '66d44aa81'
...
# Conflicts:
# resources/vanilla
2020-05-20 20:06:58 +01:00
5caae278cf
Merge commit 'f3089f577'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/network/mcpe/protocol/StartGamePacket.php
2020-05-20 20:05:48 +01:00
c5c1db1bc9
Merge commit '9516ef163'
...
# Conflicts:
# resources/vanilla
2020-05-20 20:00:56 +01:00
64f0b2deb6
Merge commit 'e982a57cb'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/network/mcpe/protocol/StartGamePacket.php
2020-05-20 19:59:46 +01:00
d33ccf4edc
Merge commit 'f57fa2252b6b7aa3667da5bb1e09fb716b951402'
...
# Conflicts:
# resources/vanilla
2020-05-20 19:57:50 +01:00
b5a74fe3c7
Merge commit '02cc370855e543e64e34388c99fb439d206323ae'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/network/mcpe/protocol/StartGamePacket.php
2020-05-20 19:56:38 +01:00
72761503cd
Merge commit '0a5d14a840a03564dcbc1d97deb91a92a00477b0'
...
# Conflicts:
# resources/vanilla
2020-05-20 19:53:23 +01:00
570a709059
Merge commit '3ec2994d7f05f30e2519430379ae0f3106be5074'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/Player.php
2020-05-20 19:52:03 +01:00
3bb53658da
Do not allow remote clients to spawn themselves before we're ready
...
this would have allowed clients to send SetLocalPlayerAsInitializedPacket at any time during the spawn sequence, which would have caused undefined behaviour around spawning logic.
2020-05-20 11:09:27 +01:00
3f1f135a59
remove a couple more Position->getWorld() usages
2020-05-19 21:38:51 +01:00
07f979fbde
RuntimeBlockMapping: bedrockKnownStates is never null
2020-05-18 17:54:27 +01:00
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
0e7a822553
Merge commit '25fb5140a2dba99c5e076849ac11e051a2970807'
2020-05-18 10:40:07 +01:00
129a7c1b3e
LoginPacketHandler: avoid trashing variables in foreach
2020-05-15 11:19:14 +01:00
31e4fc6fcb
fixing incompatible protocol handling, do not explode immediately on bad clientdata, login encode/decode is now symmetrical
2020-05-15 10:55:29 +01:00
86db3af896
remove utils\Color, use new pocketmine/color class
...
we're so close to separating protocol from core !!!
2020-05-14 20:38:08 +01:00
3dafee6aa6
NetworkSession: explicitly unregister effect manager hooks on dispose,
...
close #3455
2020-05-14 10:59:10 +01:00
36c5d9117d
LoginPacketHandler: properly handle failure to base64_decode stuff from JWT
...
previously this might just return false and blow up in your face.
I considered fixing this on stable too, but it's less useful there because so much stuff on stable just explodes at the first wrong thing anyway.
2020-05-14 09:46:44 +01:00
955b23cc8e
Merge branch 'stable'
...
# Conflicts:
# resources/vanilla
2020-05-14 00:23:36 +01:00
e9ecb9a9fd
fixed build failure
2020-05-13 22:54:24 +01:00
84291e7980
Throw a more specific exception for JWT handling errors
2020-05-13 21:23:04 +01:00
486e0e710b
JwtUtils: fix minor formatting issue
2020-05-13 20:51:24 +01:00
44a7829536
VerifyLoginException: fixed rogue usage in JwtUtils
2020-05-13 20:50:41 +01:00
d7eb4f9651
Extract more general-purpose logic to JwtUtils
...
this code could now be reused for creating custom login packets.
2020-05-13 20:46:01 +01:00
161ac468f3
ProcessLoginTask: properly cater for key parsing errors
2020-05-13 19:23:12 +01:00
934f85841c
asserts 👏 are 👏 not 👏 error 👏 checking
2020-05-13 13:37:49 +01:00
8c2878fe5b
Added JwtUtils::parse(), make ProcessLoginTask more robust
2020-05-13 13:36:42 +01:00
144a66c110
cumulative imports cleanup (again)
2020-05-12 22:38:59 +01:00
6b037d6a4c
RuntimeBlockMapping: these IDs are not static any more
2020-05-11 12:40:55 +01:00
b7cf4f01f9
remove utils\UUID, switch to pocketmine/uuid package
2020-05-11 10:46:48 +01:00
a6c35cab9a
JwtUtils: fix phpstan failure
2020-05-06 22:00:11 +01:00
0b6d6306cf
LoginPacket: fixed error handling edge case with malformed chain data JSON
2020-05-06 21:46:35 +01:00
ed757c7207
consolidate some JWT handling into one class
2020-05-06 21:32:22 +01:00
