3dabf90b0e
Merge branch 'release/3.3' into release/3.4
2018-11-04 22:38:58 +00:00
f61e14e341
Merge branch 'release/3.2' into release/3.3
2018-11-04 22:38:45 +00:00
7b24fbc8db
Utils: fix a mistake in getNiceClassName() doc
2018-11-04 22:38:38 +00:00
0543c17849
Merge branch 'release/3.3' into release/3.4
2018-11-04 22:15:46 +00:00
c4f3426bae
Merge branch 'release/3.2' into release/3.3
2018-11-04 22:15:21 +00:00
046c39b02e
Remove some Throwable abuse in AsyncTasks
2018-11-04 22:15:06 +00:00
87b471ce0f
AsyncPool: reverse e0d5c79848, don't catch unexpected exceptions thrown by onCompletion()
...
this should never throw an uncaught exception, and if it does it indicates broken code.
2018-11-04 22:09:30 +00:00
055ba6aa7c
Merge branch 'release/3.3' into release/3.4
2018-11-04 11:57:35 +00:00
5c3eed40b3
Merge branch 'release/3.2' into release/3.3
2018-11-04 11:57:28 +00:00
3e5237b6e0
ItemEntity: remove useless instanceof
2018-11-04 11:57:22 +00:00
af1227f154
Merge branch 'release/3.3' into release/3.4
2018-11-03 19:43:54 +00:00
d9a867016c
Merge branch 'release/3.2' into release/3.3
2018-11-03 19:43:45 +00:00
a50a863ab7
Chunk: be more intelligent about fast-serializing chunks
...
This reduces the amount of useless data that pthreads has to copy around.
2018-11-03 19:43:35 +00:00
9caf62778c
AsyncTask: remove $serialize parameter from setResult()
...
Whether serialization is necessary can be determined automatically based on the type of variable.
2018-11-03 16:56:24 +00:00
d257d36e55
Merge branch 'release/3.3' into release/3.4
2018-11-03 15:14:27 +00:00
1b03168b88
Merge branch 'release/3.2' into release/3.3
2018-11-03 15:12:40 +00:00
6b9fee05d6
Fixed performance bug with chunk sending
...
this process of fast-serialization, fast-deserialize, network-serialize is an order of magnitude slower than just doing the network encode directly on the main thread, and also copies more useless data.
For the main thread, the figures were something like 3x more expensive, and then an extra 7x for deserialization on the worker thread. This is a ridiculously large overhead.
2018-11-03 15:12:30 +00:00
44d8a5528e
Merge branch 'release/3.3' into release/3.4
2018-11-03 12:12:42 +00:00
45a18ffe1e
Merge branch 'release/3.2' into release/3.3
2018-11-03 12:12:23 +00:00
f0182c9996
TaskHandler: remove incorrect internal warning
...
this is perfectly fine to use, and preferable to getting a cyclic ref to the scheduler. TaskScheduler->cancelTask() does pretty much the exact same thing, and the scheduler internals are designed to deal with this anyway.
2018-11-03 12:12:02 +00:00
265b61b3e6
Merge branch 'release/3.3' into release/3.4
2018-10-31 18:55:26 +00:00
2d88058710
Merge branch 'release/3.2' into release/3.3
2018-10-31 18:55:18 +00:00
ab48d85c35
Properly deal with anonymous tasks in timings
2018-10-31 18:51:30 +00:00
cf43f479df
Server: cleanup setting up of console
2018-10-30 16:59:03 +00:00
c143834632
Merge branch 'release/3.3' into release/3.4
2018-10-30 15:43:06 +00:00
d9b7a28747
Merge branch 'release/3.2' into release/3.3
2018-10-30 15:42:52 +00:00
31ceafa111
Chest: keep inventory better in sync when paired
...
should fix #2502
2018-10-30 15:42:44 +00:00
a0eb6e23e5
Merge branch 'release/3.3' into release/3.4
2018-10-29 12:42:17 +00:00
694d7d4e20
Merge branch 'release/3.2' into release/3.3
2018-10-29 12:42:10 +00:00
2da2fdd6d4
Added a test for Item->equals() when both items have no NBT
2018-10-29 12:42:03 +00:00
0aa30295af
Merge branch 'release/3.3' into release/3.4
2018-10-26 20:09:02 +01:00
c1c56f29bb
Merge branch 'release/3.2' into release/3.3
2018-10-26 20:08:55 +01:00
9b820a0849
Guard against possible overflow bug in NetworkBinaryStream
2018-10-26 20:08:48 +01:00
c6a4bc4bf7
Merge branch 'release/3.3' into release/3.4
2018-10-25 19:36:44 +01:00
3128449033
3.3.2 is next
2018-10-25 19:36:20 +01:00
a60154e0b7
Release 3.3.1
2018-10-25 19:29:57 +01:00
4cbbf2e91c
Merge branch 'release/3.2' into release/3.3
2018-10-25 19:29:34 +01:00
b0624aff9f
3.2.7 is next
2018-10-25 19:28:54 +01:00
c38e2c5ccb
Release 3.2.6
2018-10-25 19:20:26 +01:00
02ef0bfbb4
Remove unnecessary quotes
...
these appear on the echoed message, which is undesirable.
2018-10-25 18:49:06 +01:00
a714612453
Merge branch 'release/3.3' into release/3.4
2018-10-25 18:42:09 +01:00
4835537886
Merge branch 'release/3.2' into release/3.3
2018-10-25 18:41:58 +01:00
4a6841a5a4
Added client side self rate-limiting for crashdump reporting
...
this should produce some reduction in spam at the source.
This could also be used to control the rate at which constantly-crashing servers restart to stop them spamming the disk as well, but the main concern here is eliminating crash archive involuntary DDoS by crashy servers.
2018-10-25 18:10:59 +01:00
f61e099828
Merge branch 'release/3.3' into release/3.4
2018-10-24 15:52:04 +01:00
925da62afa
Merge branch 'release/3.2' into release/3.3
2018-10-24 15:49:09 +01:00
09985c5763
Fixed async light population producing garbage when generator isn't registered, closes #2488
2018-10-24 15:49:00 +01:00
447b9562bb
Merge branch 'release/3.3' into release/3.4
2018-10-24 12:16:46 +01:00
d1ee9eb960
Merge branch 'release/3.2' into release/3.3
2018-10-24 12:00:55 +01:00
196cf8a68d
Fixed missing MoveEntityDeltaPacket field
2018-10-24 12:00:25 +01:00
cac21c2caf
SubChunk: implement branchless read/write for nibble arrays ( #2489 )
...
this was inspired by https://hub.spigotmc.org/stash/projects/SPIGOT/repos/spigot/browse/CraftBukkit-Patches/0121-Branchless-NibbleArray.patch
2018-10-22 17:46:14 +01:00
