98db4c5200
Merge branch 'stable' into master
...
# Conflicts:
# .gitmodules
# composer.lock
# resources/vanilla
# src/network/mcpe/protocol/PlayerAuthInputPacket.php
# src/pocketmine/Player.php
# src/pocketmine/network/mcpe/protocol/LoginPacket.php
2020-08-10 17:55:49 +01:00
1525001565
protocol ItemStack: added equals() method to compare net itemstacks directly
...
this will be needed for more than just this little check once item NBT gets cleaned out properly, since we'll need to compare object equality by network layer stuff instead of internals (where different network objects might deserialize to the same internal items).
2020-08-02 23:22:39 +01:00
1500668d4e
imports cleanup
2020-07-25 19:21:22 +01:00
5910905e95
PacketBatch::getPackets() may throw PacketDecodeException
2020-07-22 15:38:24 +01:00
8402465fd2
PacketBatch is now immutable
2020-07-22 15:37:06 +01:00
798efc370c
PacketBatch: get rid of putPacket()
2020-07-22 15:24:08 +01:00
1ba32c98c7
protocol: avoid potential constructor refactoring packet decode bug
...
if the order of the constructor parameters were changed, it would cause these statements to be reordered, causing packet fields to be decoded in the wrong order.
2020-07-17 23:19:33 +01:00
d9c3ec5f91
Merge branch 'stable'
...
# Conflicts:
# resources/vanilla
2020-07-11 20:14:42 +01:00
600ef033ab
PlayerSkinPacket: added ::create()
2020-07-09 13:24:31 +01:00
c35a596079
Merge commit '8ce0022de'
...
# Conflicts:
# resources/vanilla
# src/network/mcpe/protocol/types/inventory/NetworkInventoryAction.php
2020-07-04 22:34:01 +01:00
172830fc44
Merge commit '8cf025a2d'
...
# Conflicts:
# resources/vanilla
2020-07-04 22:20:42 +01:00
30591d047c
PacketBatch: added a getPackets() method which encapsulates some logic
2020-07-01 13:38:06 +01:00
01d221b794
imports cleanup
2020-06-28 17:50:49 +01:00
27511ac3ec
updated network item ID constants
2020-06-28 17:37:51 +01:00
74b0c411c4
regenerated network entity ID constants
2020-06-28 17:37:25 +01:00
45b4e3cd7a
EmoteListPacket can be ServerboundPacket ( #3635 )
2020-06-27 10:04:23 +01:00
0caf99445b
Merge commit '4fed08bcd4655d7eec8d2cdf88950789f99ed2ee'
...
# Conflicts:
# resources/vanilla
2020-06-26 22:21:49 +01:00
7e6adc41f0
Merge 1.16 support into PM4 (with changes)
2020-06-26 22:21:09 +01:00
18f04d6d96
Merge commit '3ecae0db1964562a8a13346df3593744d2288b81'
...
# Conflicts:
# resources/vanilla
2020-06-26 19:19:20 +01:00
05bd92a94b
Merge commit '60b26a7ea8939a85db9af0a99dd5a4b13e1a562d'
...
# Conflicts:
# resources/vanilla
# src/network/mcpe/protocol/serializer/PacketSerializer.php
2020-06-26 19:16:53 +01:00
d38c17835d
Properly switch to string entity IDs
2020-06-20 13:43:31 +01:00
a988578ee0
protocol: move PotionType and PotionContainerChange recipes to types/recipe namespace
2020-06-20 11:43:47 +01:00
d5db163208
protocol: added proper object wrappers for gamerules
2020-06-20 11:24:39 +01:00
954e8e6e6f
update pocketmine/math dependency
2020-06-19 11:33:10 +01:00
b3df5f4e95
CS: strip unneeded phpdoc
2020-06-18 20:01:49 +01:00
11eb1f1c5e
imports cleanup
2020-06-18 20:01:19 +01:00
05615b3eb7
ClientDataToSkinDataHelper: move safeB64Decode to its own function
2020-06-17 22:27:13 +01:00
503782d67c
moved skin-parsing code from LoginPacketHandler to its own dedicated helper class
2020-06-17 21:24:12 +01:00
55e6b2dfbc
Merge commit '1c13ba565660e0985c08f2c6b59e26f8216f87e4'
...
# Conflicts:
# resources/vanilla
# src/network/mcpe/protocol/serializer/PacketSerializer.php
2020-06-17 21:14:04 +01:00
5c94c6992d
Merge commit 'f970be0e4ddf90e64c2e87cc6b2123aa933b3ab1'
...
# Conflicts:
# resources/vanilla
2020-06-17 21:12:46 +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
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
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
90b53149d7
Merge commit '5056754ce'
...
# Conflicts:
# resources/vanilla
# src/pocketmine/Player.php
2020-06-03 12:54:00 +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
