8890 Commits

Author SHA1 Message Date
Dylan K. Taylor
af1227f154 Merge branch 'release/3.3' into release/3.4 2018-11-03 19:43:54 +00:00
Dylan K. Taylor
d9a867016c Merge branch 'release/3.2' into release/3.3 2018-11-03 19:43:45 +00:00
Dylan K. Taylor
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
Dylan K. Taylor
652256a109 Merge branch 'release/3.4' 2018-11-03 16:58:19 +00:00
Dylan K. Taylor
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
Dylan K. Taylor
e94dd367ef Merge branch 'release/3.4' 2018-11-03 15:46:31 +00:00
Dylan K. Taylor
d257d36e55 Merge branch 'release/3.3' into release/3.4 2018-11-03 15:14:27 +00:00
Dylan K. Taylor
1b03168b88 Merge branch 'release/3.2' into release/3.3 2018-11-03 15:12:40 +00:00
Dylan K. Taylor
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
Dylan K. Taylor
1b4c65e74d Merge branch 'release/3.4' 2018-11-03 12:12:59 +00:00
Dylan K. Taylor
44d8a5528e Merge branch 'release/3.3' into release/3.4 2018-11-03 12:12:42 +00:00
Dylan K. Taylor
45a18ffe1e Merge branch 'release/3.2' into release/3.3 2018-11-03 12:12:23 +00:00
Dylan K. Taylor
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
Dylan K. Taylor
acd3116591 Merge branch 'release/3.4' 2018-11-01 15:51:50 +00:00
Dylan K. Taylor
265b61b3e6 Merge branch 'release/3.3' into release/3.4 2018-10-31 18:55:26 +00:00
Dylan K. Taylor
2d88058710 Merge branch 'release/3.2' into release/3.3 2018-10-31 18:55:18 +00:00
Dylan K. Taylor
ab48d85c35 Properly deal with anonymous tasks in timings 2018-10-31 18:51:30 +00:00
Dylan K. Taylor
cf43f479df Server: cleanup setting up of console 2018-10-30 16:59:03 +00:00
Dylan K. Taylor
4879eac946 Merge branch 'release/3.4' 2018-10-30 15:43:27 +00:00
Dylan K. Taylor
c143834632 Merge branch 'release/3.3' into release/3.4 2018-10-30 15:43:06 +00:00
Dylan K. Taylor
d9b7a28747 Merge branch 'release/3.2' into release/3.3 2018-10-30 15:42:52 +00:00
Dylan K. Taylor
31ceafa111 Chest: keep inventory better in sync when paired
should fix #2502
2018-10-30 15:42:44 +00:00
Daniktheboss
d011fc518e Fixed wooden doors not dropping when removing supporting block, closes #2436 (#2496) 2018-10-29 16:16:57 +00:00
Dylan K. Taylor
95be571481 Fixed Item->equals() not working for no-NBT items since 9bb3c93285d8589cde855b08318e32514eff78c4 2018-10-29 12:45:39 +00:00
Dylan K. Taylor
3760307a88 Merge branch 'release/3.4' 2018-10-29 12:42:29 +00:00
Dylan K. Taylor
a0eb6e23e5 Merge branch 'release/3.3' into release/3.4 2018-10-29 12:42:17 +00:00
Dylan K. Taylor
694d7d4e20 Merge branch 'release/3.2' into release/3.3 2018-10-29 12:42:10 +00:00
Dylan K. Taylor
2da2fdd6d4 Added a test for Item->equals() when both items have no NBT 2018-10-29 12:42:03 +00:00
Dylan K. Taylor
a6c31b72ae Level: throw exceptions on bad positions in setBlock() 2018-10-28 16:42:16 +00:00
Dylan K. Taylor
7607e484dd Expose chunk locking to the API 2018-10-28 16:32:56 +00:00
Dylan K. Taylor
1e8b153662 Further cleanup to Simplex/Noise hierarchy 2018-10-28 16:30:18 +00:00
Dylan K. Taylor
e1795dfd49
Fixed wtf in Durable->setDamage() exception throw 2018-10-27 21:50:14 +01:00
Dylan K. Taylor
f4105fd91a Noise: remove a ton of dead code 2018-10-27 17:04:53 +01:00
Dylan K. Taylor
ff28c982ac Kick out unnecessary Perlin class
the code in here isn't used anywhere except as a base for Simplex, so it makes more sense to flatten it and get rid of the crap.
2018-10-27 16:33:58 +01:00
Dylan K. Taylor
9bb3c93285 Remove network-serialized item NBT from API layer, item NBT is now retained for the lifetime of the stack 2018-10-27 15:26:01 +01:00
Dylan K. Taylor
d2513ff908 Merge branch 'release/3.4' 2018-10-26 20:09:11 +01:00
Dylan K. Taylor
0aa30295af Merge branch 'release/3.3' into release/3.4 2018-10-26 20:09:02 +01:00
Dylan K. Taylor
c1c56f29bb Merge branch 'release/3.2' into release/3.3 2018-10-26 20:08:55 +01:00
Dylan K. Taylor
9b820a0849 Guard against possible overflow bug in NetworkBinaryStream 2018-10-26 20:08:48 +01:00
Dylan K. Taylor
0ef81e701a ItemFactory: Use a simple hashmap for item types
this is slower but yields less complicated code. Since this isn't in a hot path it's acceptable for this to slow down a little for the sake of sanity.
2018-10-26 18:38:24 +01:00
Dylan K. Taylor
93131b4d92 Rename some meta usages to variant 2018-10-26 18:20:37 +01:00
Dylan K. Taylor
7dd3b5b996 Durable: fixed leftover wtf from damage refactor 2018-10-26 18:17:34 +01:00
Dylan K. Taylor
327c8361bd Remove variant parameters from TieredTool 2018-10-26 18:16:31 +01:00
Dylan K. Taylor
f438736af5 Make some item constructor variant parameters mandatory 2018-10-26 16:51:02 +01:00
Dylan K. Taylor
51e13104dc oops, missed one 2018-10-26 16:49:25 +01:00
Dylan K. Taylor
712cafa0cc Item: remove redundant meta constructor params
these ctor params should only be used for variants in the ItemFactory registration, but all of these items have no non-zero variants anyway.
2018-10-26 16:29:14 +01:00
Dylan K. Taylor
88b3df76eb Merge branch 'release/3.4' 2018-10-25 19:36:56 +01:00
Dylan K. Taylor
c6a4bc4bf7 Merge branch 'release/3.3' into release/3.4 2018-10-25 19:36:44 +01:00
Dylan K. Taylor
3128449033 3.3.2 is next 2018-10-25 19:36:20 +01:00
Dylan K. Taylor
a60154e0b7 Release 3.3.1 3.3.1 2018-10-25 19:29:57 +01:00