6a8bb89734
Merge commit '11a3f9f1b906d0a73adb5a81a6eff120b56cf6fa'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/network/mcpe/VerifyLoginTask.php
2020-06-17 21:12:27 +01:00
8cabab20e3
Merge commit '09771849aefb70bc29202b160f65723cf926c974'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/network/mcpe/VerifyLoginTask.php
2020-06-17 21:10:59 +01:00
543023793c
Merge commit '57a310230acd8b13e96fa4f24dbdabb19927b483'
...
# Conflicts:
# resources/vanilla
2020-06-17 21:04:23 +01:00
d58ea80dca
Merge commit '130c55d9f1c3b350c2767f7656366e08a63cf1ad'
...
# Conflicts:
# resources/vanilla
# src/network/mcpe/protocol/serializer/PacketSerializer.php
# src/network/mcpe/protocol/types/entity/EntityLink.php
# tests/phpstan/configs/l8-baseline.neon
2020-06-17 21:03:45 +01:00
7c79a28fdb
Merge commit '2712befa82dc92fe26d2b913a47200ad84927799'
...
# Conflicts:
# resources/vanilla
# tests/phpstan/configs/l8-baseline.neon
2020-06-17 20:49:46 +01:00
57908586bd
more jsonmapper models for login
2020-06-17 19:10:27 +01:00
3cdf808da1
NetworkNbtSerializer: do not assume that this format is related to the disk little-endian format
2020-06-17 13:55:29 +01:00
c618932d25
Eliminate usages of BinaryStream->setBuffer() and BinaryStream->reset()
2020-06-17 13:49:43 +01:00
893f7cb6ef
fix crash whn player joins in spectator mode
2020-06-17 12:39:54 +01:00
9c46a1f141
Rename Packet->getBinaryStream() -> Packet->getSerializer()
2020-06-17 11:33:59 +01:00
6c096c44aa
Rename NetworkBinaryStream -> PacketSerializer
2020-06-17 11:31:13 +01:00
c6557f0222
protocol: added a FixedItemIds class (this is fully auto-generated, unlike the one provided by the API)
...
this may be different from the IDs exposed on the API and shouldn't be used for anything outside the protocol.
TODO: we need to review the dynamicness of item numeric IDs and find out if it's possible for them to change based on StartGamePacket content. If they can, we might need to change this.
2020-06-17 11:06:26 +01:00
3294075aad
LoginPacketHandler: use double quotes consistently
...
the mixture of single quotes and double quotes makes PHPStan type inference quietly not work, and reports an error here in checkExplicitMixed mode.
2020-06-15 20:31:09 +01:00
f55a7f8b53
Merge commit 'd8d994351'
...
# Conflicts:
# composer.lock
# resources/vanilla
# tests/phpstan/configs/l7-baseline.neon
2020-06-14 19:47:21 +01:00
9ce531fef4
(master) imports cleanup
2020-06-14 19:29:33 +01:00
465285b3c2
do not rely on GameMode::getMagicNumber() to match protocol IDs
2020-06-13 12:26:17 +01:00
f0669b7770
Merge commit '710c16260'
...
# Conflicts:
# resources/vanilla
# src/network/query/QueryInfo.php
2020-06-13 11:59:00 +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
d2d4780653
Merge commit 'a3f633862'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/Player.php
2020-06-03 13:03:23 +01:00
7d7c16b764
Merge commit '21aef97ba'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/Player.php
2020-06-03 13:00:31 +01:00
01cbd27485
Merge commit 'd64561b0b'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/Player.php
2020-06-03 12:57:20 +01:00
90b53149d7
Merge commit '5056754ce'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/Player.php
2020-06-03 12:54:00 +01:00
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
5f2e65d608
QueryHandler: be honest about dependency on Server
2020-05-23 12:28:12 +01:00
23ab6a283b
Separate QueryInfo from QueryRegenerateEvent
...
this removes some useless and confusing APIs from query info.
2020-05-23 11:55:29 +01:00
0025196a81
Merge branch 'next-minor'
...
# Conflicts:
# resources/vanilla
# src/network/upnp/UPnP.php
2020-05-23 11:16:19 +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
