mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-15 18:29:46 +00:00
Code Issues Projects Releases Wiki Activity
10,992 Commits 16 Branches 439 Tags
Commit Graph

9817 Commits

Author SHA1 Message Date
Dylan K. Taylor
5816ff85ba don't depend on phpstan 0.12.4 phpdoc inheriting 
this causes build failure because the parameter names are different to
the base class.
 2020-01-11 22:08:16 +00:00
Dylan K. Taylor
818d0e19ab RCONInstance: remove always-false branch (readPacket() never returns null) 2020-01-11 21:54:03 +00:00
Dylan K. Taylor
17720041a3 phpdoc: populate missing parameter typeinfo 2020-01-11 21:53:24 +00:00
Dylan K. Taylor
c329ff7d4f SubChunk: remove nonsensical reference from internal function 2020-01-11 21:49:33 +00:00
Dylan K. Taylor
96b91af66a Merge branch 'stable' 2020-01-11 21:41:38 +00:00
Dylan K. Taylor
8794292788 remove &$var reference notations in phpdoc 
this isn't required by the spec and PHPStan chokes on it. I was previously having it ignore these errors, but it turns out that PHPStan is not making use of extended typeinfo provided if it can't parse the tag, which is problematic on level 6 and also a problem for array-of-type. Therefore, we are going to have to take the hit.
 2020-01-11 21:20:55 +00:00
Dylan K. Taylor
43601e57bf Merge branch 'stable' 2020-01-09 21:08:16 +00:00
Dylan K. Taylor
0a39e580e9 MainLogger: log exception chains in logException(), closes #2447 
this method is simpler than #2447 and easier to apply to stable.
 2020-01-09 21:01:12 +00:00
Dylan K. Taylor
c4580dd56d MainLogger: extract a printErrorMessage() function from logException() 2020-01-09 20:51:13 +00:00
Dylan K. Taylor
fab81d28bc MainLogger: always log exceptions with CRITICAL level 
if we reached this point, it's almost always due to a general exception handler which doesn't know what else to do with the error.
 2020-01-09 20:44:21 +00:00
Dylan K. Taylor
05a450df87 Merge branch 'stable' 2020-01-09 20:16:17 +00:00
Dylan K. Taylor
64b5db4bf2 bootstrap: add some @return annotations for phpstan 2020-01-09 20:13:53 +00:00
Dylan K. Taylor
1192b8bdf1 bootstrap: add PhpDoc to critical_error to make phpstan happy 
it wants phpdoc or typehints, and we can't provide typehints because bootstrap needs to be compatible with old PHP versions.
 2020-01-09 20:09:33 +00:00
Dylan K. Taylor
aba71762e9 master-specific @var annotations 2020-01-09 17:50:01 +00:00
Dylan K. Taylor
cda1143a79 Merge branch 'stable' 2020-01-09 17:17:42 +00:00
Dylan K. Taylor
e0ed123236 Merge commit 'cda3e6f4dcc5a642c6c2597b77df7f29ecbb9397' 2020-01-09 16:49:04 +00:00
Dylan K. Taylor
c73001d65e Merge commit 'e6a58e269099a7942d157a214beacc6c30f5617d' 2020-01-09 16:46:58 +00:00
Dylan K. Taylor
3fff0a0656 BigTree: evict unmaintained dead code 
phpstan whines about all this stuff, and everything left is private, so we can get rid of it. Sadly we can't ditch the class without breaking BC, so that sticks with 4.0.
 2020-01-09 14:26:46 +00:00
Dylan K. Taylor
e1e1bfa5e3 CompressBatchedTask: remove useless code causing build failure 
assuming that pthreads does not have leak issues, this code is pointless, and if pthreads does have leak issues, this may not prevent them anyway.
 2020-01-09 14:19:35 +00:00
Dylan K. Taylor
1eedac87b2 added missing @var property types (reported by phpstan) 2020-01-09 14:13:54 +00:00
Dylan K. Taylor
cda3e6f4dc PluginDescription: clean up type information for extensions field 2020-01-09 11:20:01 +00:00
Dylan K. Taylor
e6a58e2690 format/leveldb: fix crash on truncated level.dat file 2020-01-08 09:55:03 +00:00
Dylan K. Taylor
e76cc8eb33 RakLibPacketSender: fixed session leak on server-side disconnect 2020-01-07 11:32:23 +00:00
Dylan K. Taylor
27350c4673 3.11.4 is next 2020-01-04 16:46:55 +00:00
Dylan K. Taylor
0d5704b156 Release 3.11.3 2020-01-04 16:46:55 +00:00
Dylan K. Taylor
fde888bf59 Merge commit 'f3550446267f975b33219bdde6aec8fbea614cb2' 2020-01-04 16:36:33 +00:00
Dylan K. Taylor
0050e12515 Merge commit '9232f4509c4b74718bce2d8f33ba71ca74b38d97' 
# Conflicts:
#	resources/vanilla
 2020-01-04 16:21:31 +00:00
Dylan K. Taylor
d25e0c3d98 Merge commit 'cef77907c6b21e1fb167bc3085d00a5b1e740813' 
# Conflicts:
#	resources/vanilla
#	src/timings/TimingsHandler.php
 2020-01-04 16:21:05 +00:00
Dylan K. Taylor
f355044626 resources: do not remove client-side resource packs when forcing resources 
I wanted to make this into a dedicated option, but it had some side effects (see 4794ba236a551bd839bbb8565474c19f93d97c30).
I'll settle for just disabling this useless behaviour, since we have other ways to force vanilla resources anyway; setting this flag to always-false has no user-facing effects anyway.
 2020-01-04 16:14:08 +00:00
Dylan K. Taylor
4794ba236a Revert "resource packs: added new option remove_client_resources, fixed client packs being removed when forcing resource pack download" 
This reverts commit 06ec8b83978fcc52a7964d678a97c73b50a97aa8.

unfortunately, this had some unanticipated side effects, thanks to
idiotic behaviour in the client ... when having optional downloads but
trying to force resources, the client chokes because it thinks the
server is forcing it to apply a pack that it doesn't have. Since
there's no way to detect when this problem occurs in the protocol, the
only option is to revert this.
 2020-01-04 16:04:07 +00:00
Dylan K. Taylor
9232f4509c TimingsHandler: don't bail on redundant attempts to stop non-running timers 
while it would be nice to bail, providing the environment to allow bailing without breaking stuff requires some complex changes that would reduce performance when timings is not running. Considering the limited usefulness of bailing here anyway, and the fact that it just has to be prevented to not have side effects, it doesn't make a whole lot of sense right now.

closes #3261, closes #3269, closes #3254
 2020-01-04 14:44:55 +00:00
Dylan K. Taylor
cef77907c6 Timings: fixed grandparent timers not working correctly, closes #3229 2020-01-04 13:23:04 +00:00
Dylan K. Taylor
06ec8b8397 resource packs: added new option remove_client_resources, fixed client packs being removed when forcing resource pack download 2020-01-04 13:16:47 +00:00
Dylan K. Taylor
cbc6bb29bc Merge commit 'ee08286ecaf76cd11914c5a3e914093b991c32db' 2020-01-04 12:08:47 +00:00
Dylan K. Taylor
aaa81fb346 Merge commit 'a83211f96a64167f4334a83b12bef31b4b7d55d2' 2020-01-04 12:00:57 +00:00
Dylan K. Taylor
9336b963a6 Merge commit '0b3c4ee4964faba76e1880abcf237fe6860f5248' 2020-01-04 12:00:20 +00:00
Dylan K. Taylor
79aa4959b8 Merge commit 'a9081979071ec8ad56d14474cfbc48b5c60fb440' 2020-01-04 11:28:21 +00:00
Dylan K. Taylor
ee08286eca moved git hash detection code to its own unit 2020-01-02 21:01:31 +00:00
Dylan K. Taylor
a83211f96a VersionInfo: add strict_types to stop CS tools screwing with it 2020-01-02 20:05:50 +00:00
Dylan K. Taylor
0b3c4ee496 bootstrap: don't choke on paths that have spaces in them 2019-12-30 11:58:44 +00:00
Dylan K. Taylor
54de518634 bootstrap: fixed incorrect git hash detection when cwd is not the repo root 2019-12-30 09:09:47 +00:00
Dylan K. Taylor
a908197907 Effect: document that duration is expected in ticks 2019-12-29 19:03:32 +00:00
Dylan K. Taylor
dadc5c1b87 3.11.3 is next 2019-12-29 13:11:30 +00:00
Dylan K. Taylor
a37d740111 Release 3.11.2 2019-12-29 13:11:30 +00:00
Dylan K. Taylor
6968a4232e Merge commit 'd83820477fe905a85a4d1fd11bad1dba211f0f4f' 2019-12-25 14:20:38 +00:00
Dylan K. Taylor
0f718ea28b Merge commit '8726604899d1a371567141e0831ed570d3233356' 2019-12-25 14:19:35 +00:00
Dylan K. Taylor
27fa73a4d2 Merge commit '216138a37e52e545abdba5a3600eabbcced867be' 
# Conflicts:
#	resources/vanilla
 2019-12-25 13:53:25 +00:00
Dylan K. Taylor
b6071bff36 Merge commit '911b6feaf927a7dd9f54240d9bf6b0f7684df692' 2019-12-25 13:52:21 +00:00
Dylan K. Taylor
bfc2a9107c Merge commit 'f7d66613df87f5bd3586daf02922af0a64efdce5' 2019-12-25 13:41:31 +00:00
Dylan K. Taylor
d83820477f TimingsHandler: throw on attempt to stop timer that is not running 
I do not think that this bug is in effect in the core code, but I can't be sure.
 2019-12-21 13:17:40 +00:00