mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-25 23:07:09 +00:00
Code Issues Projects Releases Wiki Activity
11,993 Commits 16 Branches 441 Tags
Commit Graph

432 Commits

Author SHA1 Message Date
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
Dylan K. Taylor
01cbd27485 Merge commit 'd64561b0b' 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
 2020-06-03 12:57:20 +01:00
Dylan K. Taylor
90b53149d7 Merge commit '5056754ce' 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
 2020-06-03 12:54:00 +01:00
Dylan K. Taylor
544bcb8f12 Merge commit '0d4e473bd' 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
 2020-06-03 12:45:28 +01:00
Dylan K. Taylor
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
Dylan K. Taylor
6df43338df Merge commit 'c3a795e87' 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
#	src/pocketmine/entity/Entity.php
 2020-05-31 14:56:37 +01:00
Dylan K. Taylor
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
Dylan K. Taylor
5f2e65d608 QueryHandler: be honest about dependency on Server 2020-05-23 12:28:12 +01:00
Dylan K. Taylor
23ab6a283b Separate QueryInfo from QueryRegenerateEvent 
this removes some useless and confusing APIs from query info.
 2020-05-23 11:55:29 +01:00
Dylan K. Taylor
0025196a81 Merge branch 'next-minor' 
# Conflicts:
#	resources/vanilla
#	src/network/upnp/UPnP.php
 2020-05-23 11:16:19 +01:00
Dylan K. Taylor
3d0e47a86f Merge branch 'next-minor' 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/network/mcpe/protocol/StartGamePacket.php
 2020-05-20 20:22:18 +01:00
Dylan K. Taylor
12f53f0ae0 Merge commit 'a29424f5b' 
# Conflicts:
#	resources/vanilla
 2020-05-20 20:21:29 +01:00
Dylan K. Taylor
9421308f73 Merge commit '3a7873598' 
# Conflicts:
#	resources/vanilla
 2020-05-20 20:19:42 +01:00
Dylan K. Taylor
1318cfbe29 Merge commit 'ab32784c7' 
# Conflicts:
#	resources/vanilla
 2020-05-20 20:18:57 +01:00
Dylan K. Taylor
c14069c42b Merge commit '816234a37' 
# Conflicts:
#	resources/vanilla
#	src/network/mcpe/protocol/UpdateBlockSyncedPacket.php
 2020-05-20 20:16:45 +01:00
Dylan K. Taylor
14c7ab50d8 Merge commit 'b7bf92a5e' 
# Conflicts:
#	resources/vanilla
 2020-05-20 20:15:15 +01:00