e0ed123236
Merge commit 'cda3e6f4dcc5a642c6c2597b77df7f29ecbb9397'
2020-01-09 16:49:04 +00:00
c73001d65e
Merge commit 'e6a58e269099a7942d157a214beacc6c30f5617d'
2020-01-09 16:46:58 +00:00
220b28dd27
Merge commit '27350c4673dff62eed6d52633f4a0c776fdbd60c'
2020-01-09 15:29:39 +00:00
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
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
1eedac87b2
added missing @var property types (reported by phpstan)
2020-01-09 14:13:54 +00:00
cda3e6f4dc
PluginDescription: clean up type information for extensions field
2020-01-09 11:20:01 +00:00
a733f094ac
phpstan: added a custom rule to disallow strict equality operators on enum members
...
comparing enums with equality operators is unreliable because there is no guarantee that the enum objects won't be somehow duplicated, through serialization, cloning or ext-parallel dumb object copying. This means that two equal enum objects may not be thw same object.
2020-01-08 19:45:05 +00:00
e6a58e2690
format/leveldb: fix crash on truncated level.dat file
2020-01-08 09:55:03 +00:00
e76cc8eb33
RakLibPacketSender: fixed session leak on server-side disconnect
2020-01-07 11:32:23 +00:00
27350c4673
3.11.4 is next
2020-01-04 16:46:55 +00:00
0d5704b156
Release 3.11.3
2020-01-04 16:46:55 +00:00
fde888bf59
Merge commit 'f3550446267f975b33219bdde6aec8fbea614cb2'
2020-01-04 16:36:33 +00:00
40936c42f2
Empty merge of commit '4794ba236a551bd839bbb8565474c19f93d97c30'
2020-01-04 16:26:29 +00:00
305b4007d2
Merge commit '6490a49c702d0a3a9f62ffb915ffa22272f17b08'
...
# Conflicts:
# resources/vanilla
# tests/travis.sh
2020-01-04 16:25:40 +00:00
dd5be9692c
Merge commit '5cd7e11b298a35bf796b41b577c28441e41ff411'
2020-01-04 16:24:29 +00:00
0050e12515
Merge commit '9232f4509c4b74718bce2d8f33ba71ca74b38d97'
...
# Conflicts:
# resources/vanilla
2020-01-04 16:21:31 +00:00
d25e0c3d98
Merge commit 'cef77907c6b21e1fb167bc3085d00a5b1e740813'
...
# Conflicts:
# resources/vanilla
# src/timings/TimingsHandler.php
2020-01-04 16:21:05 +00:00
2cfb7000ae
Empty merge of '06ec8b83978fcc52a7964d678a97c73b50a97aa8'
...
this change has been reverted, so this is just to bring the branches
inline.
2020-01-04 16:18:44 +00:00
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 4794ba236a
2020-01-04 16:14:08 +00:00
4794ba236a
Revert "resource packs: added new option remove_client_resources, fixed client packs being removed when forcing resource pack download"
...
This reverts commit 06ec8b8397
2020-01-04 16:04:07 +00:00
6490a49c70
tests: drop lint.sh - no longer needed now that we have PHPStan
2020-01-04 15:23:53 +00:00
5cd7e11b29
Use specialized build script for Travis
2020-01-04 15:15:01 +00:00
08e3b8ffdc
build: added specialized script to create a server phar
...
this is much easier to use than devtools, and allows us to make additional specializations for PM build that would otherwise just be a colossal pain in the ass.
2020-01-04 14:56:53 +00:00
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
cef77907c6
Timings: fixed grandparent timers not working correctly, closes #3229
2020-01-04 13:23:04 +00:00
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
cbc6bb29bc
Merge commit 'ee08286ecaf76cd11914c5a3e914093b991c32db'
2020-01-04 12:08:47 +00:00
aaa81fb346
Merge commit 'a83211f96a64167f4334a83b12bef31b4b7d55d2'
2020-01-04 12:00:57 +00:00
9336b963a6
Merge commit '0b3c4ee4964faba76e1880abcf237fe6860f5248'
2020-01-04 12:00:20 +00:00
79aa4959b8
Merge commit 'a9081979071ec8ad56d14474cfbc48b5c60fb440'
2020-01-04 11:28:21 +00:00
ee08286eca
moved git hash detection code to its own unit
2020-01-02 21:01:31 +00:00
a83211f96a
VersionInfo: add strict_types to stop CS tools screwing with it
2020-01-02 20:05:50 +00:00
0b3c4ee496
bootstrap: don't choke on paths that have spaces in them
2019-12-30 11:58:44 +00:00
54de518634
bootstrap: fixed incorrect git hash detection when cwd is not the repo root
2019-12-30 09:09:47 +00:00
a908197907
Effect: document that duration is expected in ticks
2019-12-29 19:03:32 +00:00
9204b11948
phpstan: 0.12.3 fixes for master
2019-12-29 17:55:03 +00:00
cccade9ade
Merge branch 'stable'
2019-12-29 15:31:10 +00:00
3e23a568ca
phpstan: properly fixing FPs on constant comparisons
2019-12-29 14:25:44 +00:00
dadc5c1b87
3.11.3 is next
2019-12-29 13:11:30 +00:00
a37d740111
Release 3.11.2
2019-12-29 13:11:30 +00:00
2de0ec02ba
phpstan 0.12.3
2019-12-28 17:22:08 +00:00
6968a4232e
Merge commit 'd83820477fe905a85a4d1fd11bad1dba211f0f4f'
2019-12-25 14:20:38 +00:00
0f718ea28b
Merge commit '8726604899d1a371567141e0831ed570d3233356'
2019-12-25 14:19:35 +00:00
27fa73a4d2
Merge commit '216138a37e52e545abdba5a3600eabbcced867be'
...
# Conflicts:
# resources/vanilla
2019-12-25 13:53:25 +00:00
e845415b17
Merge commit 'b08c38f8f9615e47ae3e5df8267b8986aadabead'
...
# Conflicts:
# resources/vanilla
2019-12-25 13:52:50 +00:00
b6071bff36
Merge commit '911b6feaf927a7dd9f54240d9bf6b0f7684df692'
2019-12-25 13:52:21 +00:00
e214ef0d13
Merge commit '2cb6990698e2575e0b64fef7e5172d9dd9694ff6'
2019-12-25 13:45:33 +00:00
bfc2a9107c
Merge commit 'f7d66613df87f5bd3586daf02922af0a64efdce5'
2019-12-25 13:41:31 +00:00
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
