mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-12 16:59:44 +00:00
Code Issues Projects Releases Wiki Activity
11,688 Commits 16 Branches 439 Tags
Commit Graph

11688 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dylan K. Taylor
8c0d441a13 Merge branch 'stable' into next-minor 2020-05-17 10:03:17 +01:00
Wumpotamus
25fb5140a2 Merge #3456: Added protocol DeviceOS constants 
close #3456

since this is a protocol addition and not API, this belongs on stable so
that protocol changes can consistently use it without worrying about
branch compatibility.
 2020-05-17 09:57:39 +01:00
Dylan K. Taylor
f5a49b6d55 LightUpdate: improve quality of property type info 2020-05-17 09:33:18 +01:00
Muqsit Rayyan
189f12a644
PermissionManager: fix timings not being stopped for default calculation (#3502) 2020-05-17 08:55:11 +01:00
Dylan K. Taylor
b3454b3488 BiomeArray: check lower bounds in ::idx() as well as upper bounds 2020-05-16 18:42:47 +01:00
Dylan K. Taylor
ae6a7b7cc9 imports cleanup 2020-05-16 18:42:08 +01:00
Dylan K. Taylor
88715c7055 extracted a HeightArray type from Chunk 2020-05-16 18:41:27 +01:00
Dylan K. Taylor
a31240f60b FastChunkSerializer: added constants for internal flags 2020-05-16 18:06:00 +01:00
Dylan K. Taylor
82d361d75f extract a BiomeArray unit from Chunk 
this now also properly validates data read from disk.
 2020-05-16 17:36:22 +01:00
Dylan K. Taylor
c30dd9f1b6 Entity: add abstract getNetworkTypeId(), remove NETWORK_ID constant 
this now requires that subclasses supply a proper NETWORK_ID.
 2020-05-16 16:08:12 +01:00
Dylan T
67666db827
Task: Remove currentTick parameter (#3498) 
This parameter is not used for the vast majority of task use cases and just serves as extra useless boilerplate code, especially for closure-based tasks.
This use case can be replaced using Server->getTick() in the cases where it matters.
 2020-05-16 15:28:45 +01:00
Dylan K. Taylor
5a8917f6f2 TaskScheduler: queue contains TaskHandler, not Task 2020-05-16 15:27:20 +01:00
Dylan K. Taylor
38e28f91e8 PermissionParser: move default string mappings to const array instead of switch 
this allows them to be used for validation in stuff like Respect In() rule.
 2020-05-16 11:26:00 +01:00
Dylan K. Taylor
3fb34ad18e remove particle/validator dependency, require respect/validation, close #3228 
this fixes a few crashes that could appear from invalid plugin_list.yml setups, which was the reason #3228 was opened to begin with. Respect also has nicer error messages, as long as you don't use the static API :)
 2020-05-15 22:57:38 +01:00
Dylan K. Taylor
f3e436592a ZippedResourcePack: detect location of manifest.json if it's not in the root 
this isn't quite as bulletproof as I'd like it to be, but it should work...
 2020-05-15 19:41:45 +01:00
Dylan K. Taylor
129a7c1b3e LoginPacketHandler: avoid trashing variables in foreach 2020-05-15 11:19:14 +01:00
Dylan K. Taylor
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
Dylan K. Taylor
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
Dylan K. Taylor
4437756987 Inventory: reduce API duplication by using a Set for viewers 2020-05-14 14:13:28 +01:00
Dylan K. Taylor
3dafee6aa6 NetworkSession: explicitly unregister effect manager hooks on dispose, 
close #3455
 2020-05-14 10:59:10 +01:00
Dylan K. Taylor
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
Dylan K. Taylor
35747874f6 Cocoa: fix drops, closes #3326 
this doesn't really do a whole lot, but I want this issue off my tracker, it's worthless...
 2020-05-14 00:56:39 +01:00
Dylan K. Taylor
59445902b8 Entity: do not spawn to players who haven't received the target chunk yet, closes #3355 
this might cause some delays on chunk resend as documented on master, but entities all get respawned on a resend, so this doesn't matter much. It's better than whatever side effects might come with spawning an entity in a chunk that the player doesn't have yet.
 2020-05-14 00:46:54 +01:00
Dylan K. Taylor
2eb62c85f6 Server: cast network.compression-level to int, closes #3393 2020-05-14 00:37:54 +01:00
Kevin
ad2a39bf13 Merge #3489: fix spawn protection check for placement checking the wrong block, close #3488, close #3489 2020-05-14 00:30:11 +01:00
Dylan K. Taylor
955b23cc8e Merge branch 'stable' 
# Conflicts:
#	resources/vanilla
 2020-05-14 00:23:36 +01:00
Dylan K. Taylor
0847358070 SkinImage: fix inverted auto-detect height/width, closes #3490 
it seems like the client doesn't care if the h/w are inverted for skins anyway, but this is still wrong anyway...
 2020-05-14 00:22:12 +01:00
Dylan K. Taylor
e9ecb9a9fd fixed build failure 2020-05-13 22:54:24 +01:00
Dylan K. Taylor
97a4a53e59 added legacy string item mappings that were unknowingly removed 
these are returned for the sake of backwards compatibility for plugins.
 2020-05-13 22:48:08 +01:00
Dylan K. Taylor
84291e7980 Throw a more specific exception for JWT handling errors 2020-05-13 21:23:04 +01:00
Dylan K. Taylor
486e0e710b JwtUtils: fix minor formatting issue 2020-05-13 20:51:24 +01:00
Dylan K. Taylor
44a7829536 VerifyLoginException: fixed rogue usage in JwtUtils 2020-05-13 20:50:41 +01:00
Dylan K. Taylor
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
Dylan K. Taylor
161ac468f3 ProcessLoginTask: properly cater for key parsing errors 2020-05-13 19:23:12 +01:00
Dylan K. Taylor
bbc249ff0d Merge branch 'next-minor' 
# Conflicts:
#	composer.lock
#	resources/vanilla
#	src/VersionInfo.php
 2020-05-13 13:54:29 +01:00
Dylan K. Taylor
1b47970e71 Merge commit 'b0445504754a2f4cd0414e25851718235aeac089' 2020-05-13 13:52:34 +01:00
Dylan K. Taylor
cc8aed5979 Merge commit '56883f9ff9d2a0934dd3585e565d109ea322f583' 
# Conflicts:
#	resources/vanilla
 2020-05-13 13:51:55 +01:00
Dylan K. Taylor
a37cf6f5b2 Merge commit '7cdd26add5a13b2bb0afcf69b4bd3b8fd87c264c' 2020-05-13 13:49:32 +01:00
Dylan K. Taylor
4c5fb1371d Merge commit 'a70fa1569027b5a77979ae513f753e71b4454b05' 2020-05-13 13:48:51 +01:00
Dylan K. Taylor
fada0d57ce Merge commit 'bd1d7b8d75976966c5480b18b91e9d8ff176612e' 2020-05-13 13:38:13 +01:00
Dylan K. Taylor
934f85841c asserts 👏 are 👏 not 👏 error 👏 checking 2020-05-13 13:37:49 +01:00
Dylan K. Taylor
8c2878fe5b Added JwtUtils::parse(), make ProcessLoginTask more robust 2020-05-13 13:36:42 +01:00
Dylan K. Taylor
c69411c984 Merge commit 'c4150d45207a8681ea1f181c7ee4ca75109a21de' 
# Conflicts:
#	composer.lock
#	resources/vanilla
 2020-05-13 13:30:31 +01:00
Dylan K. Taylor
934a18df3c Merge commit '2f47597d75b514944a2f3f5d293f2fb72dd7fb56' 2020-05-13 13:28:47 +01:00
Dylan K. Taylor
45f9c61d0f forward-port of 2f47597d75b514944a2f3f5d293f2fb72dd7fb56 as best it fits 2020-05-13 13:28:35 +01:00
Dylan K. Taylor
8766d4050c Merge branch 'stable' into next-minor 2020-05-13 13:18:55 +01:00
Dylan K. Taylor
54f41dc145 3.12.2 is next 2020-05-13 13:10:25 +01:00
Dylan K. Taylor
ded45bddfe Release 3.12.1 3.12.1 2020-05-13 13:10:10 +01:00
Dylan K. Taylor
b044550475 Player: duct tape for yet another login sequence bug in the shitty net architecture 2020-05-13 12:59:43 +01:00
Dylan K. Taylor
a70fa15690 phpstan 0.12.25, drop some bug-filtering error patterns 2020-05-13 12:51:52 +01:00