mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-25 06:54:41 +00:00
Code Issues Projects Releases Wiki Activity
14,827 Commits 16 Branches 441 Tags
Commit Graph

747 Commits

Author SHA1 Message Date
alvin0319
45b4e3cd7a
EmoteListPacket can be ServerboundPacket (#3635) 2020-06-27 10:04:23 +01:00
Dylan K. Taylor
9f323bc480 phpstorm, stop messing with my code pls 2020-06-26 22:25:09 +01:00
Dylan K. Taylor
0caf99445b Merge commit '4fed08bcd4655d7eec8d2cdf88950789f99ed2ee' 
# Conflicts:
#	resources/vanilla
 2020-06-26 22:21:49 +01:00
Dylan K. Taylor
7e6adc41f0 Merge 1.16 support into PM4 (with changes) 2020-06-26 22:21:09 +01:00
Dylan K. Taylor
18f04d6d96 Merge commit '3ecae0db1964562a8a13346df3593744d2288b81' 
# Conflicts:
#	resources/vanilla
 2020-06-26 19:19:20 +01:00
Dylan K. Taylor
9887a8b778 Merge commit 'c5bbb2bcbc4ecc8bcfd9bfaefd27c1b51e482d77' 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
#	src/pocketmine/network/mcpe/protocol/InventoryTransactionPacket.php
 2020-06-26 19:18:58 +01:00
Dylan K. Taylor
05bd92a94b Merge commit '60b26a7ea8939a85db9af0a99dd5a4b13e1a562d' 
# Conflicts:
#	resources/vanilla
#	src/network/mcpe/protocol/serializer/PacketSerializer.php
 2020-06-26 19:16:53 +01:00
Dylan K. Taylor
52fd1a8c1d CommandSender: export getLanguage() 
this currently serves as a proxy to the server main language, but it can be used by third party implementations to choose a non-Server language.
 2020-06-22 20:05:23 +01:00
Dylan K. Taylor
d38c17835d Properly switch to string entity IDs 2020-06-20 13:43:31 +01:00
Dylan K. Taylor
a988578ee0 protocol: move PotionType and PotionContainerChange recipes to types/recipe namespace 2020-06-20 11:43:47 +01:00
Dylan K. Taylor
d5db163208 protocol: added proper object wrappers for gamerules 2020-06-20 11:24:39 +01:00
Dylan K. Taylor
954e8e6e6f update pocketmine/math dependency 2020-06-19 11:33:10 +01:00
Dylan K. Taylor
64e9647334 Merge branch 'stable' 
# Conflicts:
#	resources/vanilla
#	src/network/mcpe/convert/LegacySkinAdapter.php
#	tests/phpstan/configs/check-explicit-mixed-baseline.neon
#	tests/phpstan/configs/phpstan-bugs.neon
 2020-06-19 10:48:27 +01:00
Dylan K. Taylor
b3df5f4e95 CS: strip unneeded phpdoc 2020-06-18 20:01:49 +01:00
Dylan K. Taylor
11eb1f1c5e imports cleanup 2020-06-18 20:01:19 +01:00
Dylan K. Taylor
755e53cd71 JwtUtils: added a split() function to reduce code duplication 2020-06-18 12:05:54 +01:00
Dylan K. Taylor
222399d178 EncryptionContext: fix exception message 2020-06-18 11:52:05 +01:00
Dylan K. Taylor
95114dcc1e EncryptionContext: fixed a phpstan level 7 error (openssl_digest() might return false for god knows what reason) 2020-06-18 11:50:43 +01:00
Dylan K. Taylor
edc3156bea Rename NetworkCipher -> EncryptionContext 2020-06-18 11:37:53 +01:00
Dylan K. Taylor
82b3e3398b make more use of igbinary_serialize() and igbinary_unserialize() 2020-06-17 23:03:03 +01:00
Dylan K. Taylor
6f4d4be3da InGamePacketHandler: handle InvalidSkinException thrown by SkinAdapter::fromSkinData() 2020-06-17 22:31:44 +01:00
Dylan K. Taylor
05615b3eb7 ClientDataToSkinDataHelper: move safeB64Decode to its own function 2020-06-17 22:27:13 +01:00
Dylan K. Taylor
e6a3f7baa2 Merge branch 'stable' 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
 2020-06-17 22:23:17 +01:00
Dylan K. Taylor
a686840e5e RuntimeBlockMapping: fixed palette cache never being initialized 
I must have been very tired when I wrote this code
 2020-06-17 21:33:56 +01:00
Dylan K. Taylor
333ed8ed2f RuntimeBlockMapping: remove unnecessary nullable flag 2020-06-17 21:32:51 +01:00
Dylan K. Taylor
715fca8986 LoginPacketHandler: use playerInfo directly again, fix another 2 PHPStan level 8 errors 2020-06-17 21:30:34 +01:00
Dylan K. Taylor
eefb6ae8e7 LoginPacketHandler: use reference to new PlayerInfo directly, fixes a PHPStan level 8 error 2020-06-17 21:29:16 +01:00
Dylan K. Taylor
503782d67c moved skin-parsing code from LoginPacketHandler to its own dedicated helper class 2020-06-17 21:24:12 +01:00
Dylan K. Taylor
55e6b2dfbc Merge commit '1c13ba565660e0985c08f2c6b59e26f8216f87e4' 
# Conflicts:
#	resources/vanilla
#	src/network/mcpe/protocol/serializer/PacketSerializer.php
 2020-06-17 21:14:04 +01:00
Dylan K. Taylor
5c94c6992d Merge commit 'f970be0e4ddf90e64c2e87cc6b2123aa933b3ab1' 
# Conflicts:
#	resources/vanilla
 2020-06-17 21:12:46 +01:00
Dylan K. Taylor
6a8bb89734 Merge commit '11a3f9f1b906d0a73adb5a81a6eff120b56cf6fa' 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/network/mcpe/VerifyLoginTask.php
 2020-06-17 21:12:27 +01:00
Dylan K. Taylor
8cabab20e3 Merge commit '09771849aefb70bc29202b160f65723cf926c974' 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/network/mcpe/VerifyLoginTask.php
 2020-06-17 21:10:59 +01:00
Dylan K. Taylor
543023793c Merge commit '57a310230acd8b13e96fa4f24dbdabb19927b483' 
# Conflicts:
#	resources/vanilla
 2020-06-17 21:04:23 +01:00
Dylan K. Taylor
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
Dylan K. Taylor
7c79a28fdb Merge commit '2712befa82dc92fe26d2b913a47200ad84927799' 
# Conflicts:
#	resources/vanilla
#	tests/phpstan/configs/l8-baseline.neon
 2020-06-17 20:49:46 +01:00
Dylan K. Taylor
57908586bd more jsonmapper models for login 2020-06-17 19:10:27 +01:00
Dylan K. Taylor
3cdf808da1 NetworkNbtSerializer: do not assume that this format is related to the disk little-endian format 2020-06-17 13:55:29 +01:00
Dylan K. Taylor
c618932d25 Eliminate usages of BinaryStream->setBuffer() and BinaryStream->reset() 2020-06-17 13:49:43 +01:00
Dylan K. Taylor
893f7cb6ef fix crash whn player joins in spectator mode 2020-06-17 12:39:54 +01:00
Dylan K. Taylor
9c46a1f141 Rename Packet->getBinaryStream() -> Packet->getSerializer() 2020-06-17 11:33:59 +01:00
Dylan K. Taylor
6c096c44aa Rename NetworkBinaryStream -> PacketSerializer 2020-06-17 11:31:13 +01:00
Dylan K. Taylor
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
Dylan K. Taylor
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
Dylan K. Taylor
f55a7f8b53 Merge commit 'd8d994351' 
# Conflicts:
#	composer.lock
#	resources/vanilla
#	tests/phpstan/configs/l7-baseline.neon
 2020-06-14 19:47:21 +01:00
Dylan K. Taylor
9ce531fef4 (master) imports cleanup 2020-06-14 19:29:33 +01:00
Dylan K. Taylor
465285b3c2 do not rely on GameMode::getMagicNumber() to match protocol IDs 2020-06-13 12:26:17 +01:00
Dylan K. Taylor
f0669b7770 Merge commit '710c16260' 
# Conflicts:
#	resources/vanilla
#	src/network/query/QueryInfo.php
 2020-06-13 11:59:00 +01:00
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
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