10819 Commits

Author SHA1 Message Date
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
e845415b17 Merge commit 'b08c38f8f9615e47ae3e5df8267b8986aadabead'
# Conflicts:
#	resources/vanilla
2019-12-25 13:52:50 +00:00
Dylan K. Taylor
b6071bff36 Merge commit '911b6feaf927a7dd9f54240d9bf6b0f7684df692' 2019-12-25 13:52:21 +00:00
Dylan K. Taylor
e214ef0d13 Merge commit '2cb6990698e2575e0b64fef7e5172d9dd9694ff6' 2019-12-25 13:45:33 +00:00
Dylan K. Taylor
bfc2a9107c Merge commit 'f7d66613df87f5bd3586daf02922af0a64efdce5' 2019-12-25 13:41:31 +00:00
Dylan T
8726604899
Merge #3251: Remove usages of empty() 2019-12-19 11:08:08 +00:00
Dylan K. Taylor
9cbe378e8c Timezone: fix possible crash on CentOS 2019-12-18 11:23:24 +00:00
Dylan K. Taylor
494660102e Replace empty() usages with count() 2019-12-18 11:23:24 +00:00
Luke
216138a37e
PlayerAuthInputPacket: Fix assigning variable in static context 2019-12-17 22:04:24 +08:00
Dylan K. Taylor
b08c38f8f9 build/make-release: remove redundant require_once
this is included by vendor/autoload.php since 3.7.x.
2019-12-17 11:47:07 +00:00
Dylan K. Taylor
911b6feaf9 NetworkInventoryAction: remove dead code
the trading & beacon types need to be checked as well, but I don't have the tools to check that right now.
2019-12-17 11:17:40 +00:00
Dylan K. Taylor
2cb6990698 Enchantment: don't throw exceptions on out of range IDs
this function is used for data deserialization, and data may have bad enchantment IDs in it.
2019-12-14 10:04:51 +00:00
Dylan K. Taylor
f7d66613df CompletedUsingItemPacket: added missing #include, closes #3219 2019-12-13 19:50:40 +00:00
Dylan K. Taylor
f7eea9bebb Merge branch 'stable' 2019-12-13 18:23:01 +00:00
Dylan K. Taylor
7c15fd6b00 Merge commit '9e1f6a24868823ad06edb6a79d0cb391e637bcb8' 2019-12-13 18:21:57 +00:00
Dylan K. Taylor
95c32d26df Explosion: fixed ray trace getting stuck on a block when it encounters an empty subchunk
this might have caused unexpected behaviour in large caves.
2019-12-13 18:07:59 +00:00
Dylan K. Taylor
bcc3e20c31 DiskResourceProvider: do not arbitrarily suffix /resources/ 2019-12-13 17:58:53 +00:00
Dylan K. Taylor
9e1f6a2486 protocol: updated particle IDs 2019-12-13 10:52:09 +00:00
Dylan K. Taylor
81620441a4 CompoundTagMetadataProperty: fix unhandled exception when decoding 2019-12-12 20:27:40 +00:00
Dylan K. Taylor
0a4a1f634f Item: fixed possible type violation in jsonDeserialize() 2019-12-12 20:26:26 +00:00
Dylan K. Taylor
771ccbb727 Server: require a DynamicClassLoader instance 2019-12-12 20:13:51 +00:00
Dylan K. Taylor
c36377ea5a Merge branch 'next-minor' 2019-12-12 19:47:12 +00:00
Dylan K. Taylor
870c66d1fe Merge branch 'stable' into next-minor 2019-12-12 18:29:04 +00:00
Dylan K. Taylor
76994f15ac phpstan: green on level 5 2019-12-12 18:27:26 +00:00
Dylan K. Taylor
cf73d74bd0 format/anvil: fixed possible type violation on saving chunk 2019-12-12 18:24:21 +00:00
Dylan K. Taylor
37a8d95464 world IO: fixed crashes when garbage data found in tile/entity NBT data 2019-12-12 18:21:23 +00:00
Dylan K. Taylor
9a4b72add5 PlayerInventory: fix type violation when calling equipItem() for non-Player holder 2019-12-12 16:31:22 +00:00
Dylan K. Taylor
919534d978 EnderChest: fixed crash when plugins overwrite tile classes with incompatible ones
relates to 47a959dace95eafe79212a444e3f865475c6ee8e
2019-12-12 16:28:30 +00:00
Dylan K. Taylor
cb598155a4 Server: add @return annotation to crashDump() to make phpstan happy
this is technically a bug in PHPStan, but it's easier to do this than report a bug.
2019-12-12 16:19:57 +00:00
Dylan K. Taylor
00888fdc55 TranslationContainer::__construct() accepts float and int too (they can be casted to string) 2019-12-12 16:19:04 +00:00
Dylan K. Taylor
77795ae3bc BaseLang::translateString() accepts float and int too (they can be casted to string) 2019-12-12 16:18:11 +00:00
Dylan K. Taylor
f39fc7e525 CompressBatchedTask::__construct() accepts Player[] not string[] 2019-12-12 16:16:48 +00:00
Dylan K. Taylor
77f7595e0e Location::__construct() accepts floats for x,y,z 2019-12-12 16:16:16 +00:00
Dylan K. Taylor
e8d3a25028 Position::__construct() accepts floats for x,y,z 2019-12-12 16:15:49 +00:00
Dylan K. Taylor
1370930ea9 Entity: remove redundant defaults from lastX lastY lastZ, remove nullability
these fields are never null because they are initialized in the constructor, and they are never written to with null nor ever expected to be null.
2019-12-12 16:14:30 +00:00
Dylan K. Taylor
1c6d3cd580 master: green on phpstan level 4 2019-12-12 15:25:15 +00:00
Dylan K. Taylor
6ace4733ce DataPacket: fixed var_dump() buffer bin2hex not working
in BinaryUtils new versions, BinaryStream->buffer is private.
detected by phpstan level 4
2019-12-12 15:02:42 +00:00
Dylan K. Taylor
9a31cbf5ef ChunkCache: fixed possible undefined offset crash in restartPendingRequest() 2019-12-12 13:55:30 +00:00
Dylan K. Taylor
137245ed7b ItemFactory: fix var type doc in get() 2019-12-12 13:54:44 +00:00
Dylan K. Taylor
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
Dylan K. Taylor
a9c09e4517 Merge branch 'next-minor' 2019-12-12 13:52:14 +00:00
Dylan K. Taylor
1a467420e3 Merge branch 'stable' into next-minor 2019-12-12 13:07:02 +00:00
Dylan K. Taylor
70c3008b7b phpstan: green on level 4 2019-12-12 13:00:57 +00:00
Dylan K. Taylor
46930b98b7 Timings: add a dedicated field for checking initialization 2019-12-12 12:59:01 +00:00
Dylan K. Taylor
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
Dylan K. Taylor
62069bc7af Level: fix return type content doc comment for getAdjacentChunks() 2019-12-12 12:18:35 +00:00
Dylan K. Taylor
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
Dylan K. Taylor
a9fafbc5eb BanEntry: remove nullable return from parseDate()
this function never returns null
2019-12-12 11:59:41 +00:00
Dylan K. Taylor
b8778cb791 LevelProvider: fix doc comment of ::generate()
this raised false positives on phpstan level 4
2019-12-12 11:59:12 +00:00