mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-22 08:44:01 +00:00
Code Issues Projects Releases Wiki Activity
8,564 Commits 15 Branches 438 Tags
Commit Graph

8564 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dylan K. Taylor
c496480d2b Merge branch 'release/3.1' into release/3.2 2018-08-19 19:52:40 +01:00
Dylan K. Taylor
6fce2b3349 Merge branch 'release/3.0' into release/3.1 2018-08-19 19:52:30 +01:00
Dylan K. Taylor
64ed8adefc Cactus: fixed place/break logic mismatch causing item spewing 2018-08-19 19:52:07 +01:00
Dylan K. Taylor
2eda8cfad3 Merge branch 'release/3.1' into release/3.2 2018-08-19 16:01:47 +01:00
Dylan K. Taylor
91be5aba0c Merge branch 'release/3.0' into release/3.1 2018-08-19 16:00:25 +01:00
Dylan K. Taylor
5df601c817 Add @see docs so PhpStorm can see dynamic constructor usages 
PhpStorm can't see constructor usages when the class name is dynamic. This causes maintenance problems because cross-referencing constructors called like this doesn't show up dynamic calls.
 2018-08-19 16:00:15 +01:00
Dylan K. Taylor
21e7b5ea43 TesterPlugin: removed usage of deprecated ServerCommandEvent 2018-08-19 14:05:26 +01:00
Dylan K. Taylor
8304675af7 Merge branch 'release/3.1' into release/3.2 2018-08-19 13:59:58 +01:00
Dylan K. Taylor
1a47735d84 Merge branch 'release/3.0' into release/3.1 2018-08-19 13:59:34 +01:00
Dylan K. Taylor
0cdf4d0c55 Spoon the TesterPlugin into the main repository 
I am eating my own words this once, because having the tester plugin as a separate repository makes no sense - it is just added barriers to writing proper tests with no actual benefit. Since the tester plugin is specifically intended for CI, it doesn't make sense for it to be in its own module.
 2018-08-19 13:58:13 +01:00
Dylan K. Taylor
e6e28b74b5 Nuke the TesterPlugin submodule 2018-08-19 13:47:43 +01:00
SOFe
ebffff0caa Added CommandEvent, deprecated (Remote)?ServerCommandEvent (#2376) 2018-08-19 12:59:16 +01:00
Dylan K. Taylor
0dc4bd36e1 Form: change handleResponse() return type to void 
this returning is counter intuitive and doesn't make any sense without the queuing mechanism. Instead it's simpler to just use Player->sendForm().
 2018-08-19 11:44:59 +01:00
Dylan K. Taylor
9d17c9a09d Merge branch 'release/3.1' into release/3.2 2018-08-19 11:22:58 +01:00
Dylan K. Taylor
72f46b4631 Merge branch 'release/3.0' into release/3.1 2018-08-19 11:22:51 +01:00
Dylan K. Taylor
3892f2f404 Config: Properly prevent keys getting transformed into bools 
The original regex almost completely failed at its objective, because it a) only worked if there was no value for the key, and b) did not prevent all such occurrences getting transformed, while quoting patterns that would not get transformed anyway.
 2018-08-19 11:22:36 +01:00
Dylan K. Taylor
bfa415e108 Add unit tests for json decoding hack 2018-08-19 10:30:52 +01:00
Dylan K. Taylor
b66095cb36
Added a hack for MC W10 JSON empty strings bug (#2383) 2018-08-19 10:10:40 +01:00
Dylan K. Taylor
0336ae8229 Merge branch 'release/3.1' into release/3.2 2018-08-17 19:47:41 +01:00
Dylan K. Taylor
4a1d67cb91 Merge branch 'release/3.0' into release/3.1 2018-08-17 19:47:34 +01:00
Dylan K. Taylor
b4694092b7 Painting: fix motive not being saved 2018-08-17 19:47:26 +01:00
Dylan K. Taylor
4b3e17e681 Sync 3.2 and 3.1 branches 2018-08-16 18:33:54 +01:00
Dylan K. Taylor
d99ee515c6 3.1.5 is next 2018-08-16 18:33:27 +01:00
Dylan K. Taylor
17f7dc34be Release 3.1.4 3.1.4 2018-08-16 18:26:49 +01:00
Dylan K. Taylor
a63d66c048 Sync 3.1 and 3.0 branches 2018-08-16 18:26:26 +01:00
Dylan K. Taylor
95f6995ae0 3.0.12 is next 2018-08-16 18:25:31 +01:00
Dylan K. Taylor
4a24d7909e Release 3.0.11 3.0.11 2018-08-16 18:14:04 +01:00
Dylan K. Taylor
5424644ca1 Merge branch 'release/3.1' into release/3.2 2018-08-16 15:52:19 +01:00
Dylan K. Taylor
4e2387edc1 Merge branch 'release/3.0' into release/3.1 2018-08-16 15:52:12 +01:00
Frago9876543210
a5e38576ef ItemEntity: fixed using -1 for infinite pickup delay not working 
closes #2382 (squash-merge)
 2018-08-16 15:52:05 +01:00
Dylan K. Taylor
aa7c4bc64d Merge branch 'release/3.1' into release/3.2 2018-08-15 13:48:46 +01:00
Dylan K. Taylor
381151dedc Merge branch 'release/3.0' into release/3.1 2018-08-15 13:48:36 +01:00
Dylan K. Taylor
a604e6835e CoalOre: fixed ignoring silk touch for XP drops, closes #2374 2018-08-15 13:48:29 +01:00
Dylan K. Taylor
df8e10cad9 Forms API, part 1: add Player->sendForm() and Form interface 
There's no implementation here yet, but that can come later. This lays the ground for allowing plugins to have an integrated method to send forms, as well as a solution to the ID conflict problem.

A built in implementation should not be a concretion and it should be able to be swapped for third party implementations. This enables the possiblity to do so.
 2018-08-14 16:06:55 +01:00
Dylan K. Taylor
d98a6e566c Merge branch 'release/3.1' into release/3.2 2018-08-14 15:03:30 +01:00
Dylan K. Taylor
142a6d7678 Merge branch 'release/3.0' into release/3.1 2018-08-14 15:03:22 +01:00
Dylan K. Taylor
b2ca364de0 SplashPotion: Don't apply effects to entities which are not alive 
fixes #2372
 2018-08-14 15:03:15 +01:00
Dylan K. Taylor
ade2be9eee Merge branch 'release/3.1' into release/3.2 2018-08-13 13:22:40 +01:00
Dylan K. Taylor
09ed40a921 Merge branch 'release/3.0' into release/3.1 2018-08-13 13:22:32 +01:00
Dylan K. Taylor
565373cee6 OfflinePlayer: remove unnecessary getName() usages 2018-08-13 13:22:00 +01:00
Dylan K. Taylor
c29723e3c4 OfflinePlayer: remove unnecessary strtolower() calls 
closes #2371
 2018-08-13 13:18:58 +01:00
Dylan K. Taylor
39ed6a7cdf Merge branch 'release/3.1' into release/3.2 2018-08-11 19:59:53 +01:00
Dylan K. Taylor
a8811ab2b3 Fixed 1.5.0 PlayerSkinPacket protocol change that somehow disappeared 
I am 100% sure I committed this change, but it isn't in the merge...
 2018-08-11 19:59:44 +01:00
Dylan K. Taylor
bec5aaa54b Merge branch 'release/3.1' into release/3.2 2018-08-11 19:37:18 +01:00
Dylan K. Taylor
974583a853 Merge branch 'release/3.0' into release/3.1 2018-08-11 19:37:10 +01:00
Dylan K. Taylor
03f8fe62d4 Fixed structure of GuiDataPickItemPacket 
this changed in 1.2.0.7 beta and I didn't spot it.
 2018-08-11 19:36:53 +01:00
Dylan K. Taylor
cf29ab1f17 Arrow: remove unused import 2018-08-07 19:06:40 +01:00
Dylan K. Taylor
c5c5a53a13 Merge branch 'release/3.1' into release/3.2 2018-08-07 18:49:13 +01:00
Dylan K. Taylor
699f35cc05 Merge branch 'release/3.0' into release/3.1 2018-08-07 18:49:06 +01:00
Dylan K. Taylor
8fa196efc9 FallingBlock: fixed state not being saved 2018-08-07 18:48:52 +01:00