Commit Graph

10780 Commits

Author SHA1 Message Date
137245ed7b ItemFactory: fix var type doc in get() 2019-12-12 13:54:44 +00:00
89458660cf VanillaEffects: return null instead of throwing on invalid effect ID
we don't expect plugin devs to be using this any more, and it doesn't make sense to throw on data deserialize. This throw was unchecked and a potential server crash might have occurred in Living on data load.
2019-12-12 13:54:05 +00:00
a9c09e4517 Merge branch 'next-minor' 2019-12-12 13:52:14 +00:00
1a467420e3 Merge branch 'stable' into next-minor 2019-12-12 13:07:02 +00:00
70c3008b7b phpstan: green on level 4 2019-12-12 13:00:57 +00:00
46930b98b7 Timings: add a dedicated field for checking initialization 2019-12-12 12:59:01 +00:00
92be8c8ec0 PopulationTask: don't assume anything about TLS return values
while these SHOULD be what we say they are, it's possible for something else to overwrite them with junk and make the server catch fire.
2019-12-12 12:19:54 +00:00
62069bc7af Level: fix return type content doc comment for getAdjacentChunks() 2019-12-12 12:18:35 +00:00
26230c1f9b Player: don't report never-played for a disconnected player
this should catch fire like everything else does.
2019-12-12 12:17:52 +00:00
a9fafbc5eb BanEntry: remove nullable return from parseDate()
this function never returns null
2019-12-12 11:59:41 +00:00
b8778cb791 LevelProvider: fix doc comment of ::generate()
this raised false positives on phpstan level 4
2019-12-12 11:59:12 +00:00
73c5fe5cf9 BaseInventory: correctly annotate content type of slots field
fixes warnings on phpstan level 4
2019-12-12 11:58:11 +00:00
b3cfa5a3a0 TimingsHandler: use weak comparison for stopTiming start check
this could be an int or float, and 0 !== 0.0.
2019-12-12 11:48:34 +00:00
6127a02a8b phpstan 0.12.2 2019-12-12 10:43:45 +00:00
6935030e0c entity: use 0 for no-target a la vanilla 1.13, fix player arms bug
I have no idea why this was changed, -1 is still used for every other property, but packet traces confirm this is correct.
2019-12-12 00:20:09 +00:00
80917692c1 Merge branch 'stable' 2019-12-11 23:37:36 +00:00
a1610500e9 Merge tag '3.11.1' 2019-12-11 23:35:20 +00:00
c926674d07 Merge commit '95683642774b1896c5de6f09dd528c1d3766d04d' 2019-12-11 23:26:40 +00:00
4651bcf8c3 master: imports cleanup
it was easier to make an empty merge and re-run php-cs-fixer afterwards.
2019-12-11 23:23:03 +00:00
62f9991e17 Merge commit '73d4ff6b52189c0a15ea7a2c9bd57af178d234f2' 2019-12-11 23:18:00 +00:00
19f75768ed Merge commit '1a99938e4b5af0295e449379dbdb0a3ffe703efd' 2019-12-11 23:15:48 +00:00
2714c7ab59 Merge tag '3.10.1'
it looks like the changes were already integrated by the previous merge,
which I screwed up with a stash.
2019-12-11 23:13:02 +00:00
c85c1c3c3f Merge commit '82d9e481d2a0a389fbbc6dfd3672fc366127febc' 2019-12-11 23:06:35 +00:00
dbca36e5e2 SkinImage: throw on wrong data length 2019-12-11 22:45:14 +00:00
1171bae691 login: read the correct key SkinAnimationData 2019-12-11 22:40:05 +00:00
494f8e8251 login: fixed missing base64_decode() for animation images 2019-12-11 22:39:40 +00:00
40a2211a5a Release 3.11.1 3.11.1 2019-12-11 20:20:26 +00:00
3c9af56e06 3.11.2 is next 2019-12-11 20:20:26 +00:00
0196aa21d7 updated BedrockData submodule, close #3222, close #3223 2019-12-11 20:19:17 +00:00
833f3e574b 3.11.1 is next 2019-12-11 18:35:03 +00:00
a386ff8ce7 Release 3.11.0 3.11.0 2019-12-11 18:35:03 +00:00
e6c3b0fc0d Changes for 1.14
there are no protocol changes in 1.14 that matter; the reason the protocol version has been bumped is because of new blocks, items, mobs and recipes.
2019-12-11 18:32:22 +00:00
0e1321933f ScriptCustomEventPacket: added missing interfaces 2019-12-10 10:41:36 +00:00
9568364277 fix minor formatting issue in SkinAdapterSingleton 2019-12-09 21:19:15 +00:00
73d4ff6b52 more missed function imports 2019-12-09 21:16:35 +00:00
7e98aa1497 leveldb: remove usage of multi-import statement
this doesn't conform to the code style.
2019-12-09 20:28:02 +00:00
f00c69c513 added missing function imports 2019-12-09 20:13:02 +00:00
50a4c42f3f NetworkBinaryStream: fix misplaced import 2019-12-09 19:53:32 +00:00
6b61efcfc8 remove unused imports 2019-12-09 19:49:21 +00:00
1a99938e4b LegacySkinAdapter: clean up nonsensical code ordering 2019-12-09 18:26:20 +00:00
a4d68fb32b LegacySkinAdapter: fix some wacky cape handling logic
I added checks for length validity locally and ran into some interesting behaviour because of this code.
2019-12-09 18:16:46 +00:00
97866cd8f6 updated RakLib dependency 2019-12-09 11:27:00 +00:00
3fa628f259 updated NBT dependency 2019-12-09 11:26:43 +00:00
02fcfcc383 Merge branch 'stable' into next-minor 2019-12-09 10:47:53 +00:00
ab628d0254 Merge tag '3.9.8' 2019-12-08 17:49:39 +00:00
705228f427 Chunk: remove useless field defaults 2019-12-08 11:08:07 +00:00
6b21f160bd Chunk: fix type docs for NBTentities and NBTtiles 2019-12-08 11:07:14 +00:00
af6cb605c5 Chunk: fix data loss caused by d3d7709ead 2019-12-08 11:02:40 +00:00
4eb59c0372 Release 3.10.1 3.10.1 2019-12-07 16:41:41 +00:00
5682cc8d53 3.10.2 is next 2019-12-07 16:41:41 +00:00