7836 Commits

Author SHA1 Message Date
Dylan K. Taylor
72f46b4631 Merge branch 'release/3.0' into release/3.1 2018-08-19 11:22:51 +01:00
Dylan K. Taylor
3892f2f404 Config: Properly prevent keys getting transformed into bools
The original regex almost completely failed at its objective, because it a) only worked if there was no value for the key, and b) did not prevent all such occurrences getting transformed, while quoting patterns that would not get transformed anyway.
2018-08-19 11:22:36 +01:00
Dylan K. Taylor
4a1d67cb91 Merge branch 'release/3.0' into release/3.1 2018-08-17 19:47:34 +01:00
Dylan K. Taylor
b4694092b7 Painting: fix motive not being saved 2018-08-17 19:47:26 +01:00
Dylan K. Taylor
d99ee515c6 3.1.5 is next 2018-08-16 18:33:27 +01:00
Dylan K. Taylor
17f7dc34be Release 3.1.4 3.1.4 2018-08-16 18:26:49 +01:00
Dylan K. Taylor
a63d66c048 Sync 3.1 and 3.0 branches 2018-08-16 18:26:26 +01:00
Dylan K. Taylor
95f6995ae0 3.0.12 is next 2018-08-16 18:25:31 +01:00
Dylan K. Taylor
4a24d7909e Release 3.0.11 3.0.11 2018-08-16 18:14:04 +01:00
Dylan K. Taylor
4e2387edc1 Merge branch 'release/3.0' into release/3.1 2018-08-16 15:52:12 +01:00
Frago9876543210
a5e38576ef ItemEntity: fixed using -1 for infinite pickup delay not working
closes #2382 (squash-merge)
2018-08-16 15:52:05 +01:00
Dylan K. Taylor
381151dedc Merge branch 'release/3.0' into release/3.1 2018-08-15 13:48:36 +01:00
Dylan K. Taylor
a604e6835e CoalOre: fixed ignoring silk touch for XP drops, closes #2374 2018-08-15 13:48:29 +01:00
Dylan K. Taylor
142a6d7678 Merge branch 'release/3.0' into release/3.1 2018-08-14 15:03:22 +01:00
Dylan K. Taylor
b2ca364de0 SplashPotion: Don't apply effects to entities which are not alive
fixes #2372
2018-08-14 15:03:15 +01:00
Dylan K. Taylor
09ed40a921 Merge branch 'release/3.0' into release/3.1 2018-08-13 13:22:32 +01:00
Dylan K. Taylor
565373cee6 OfflinePlayer: remove unnecessary getName() usages 2018-08-13 13:22:00 +01:00
Dylan K. Taylor
c29723e3c4 OfflinePlayer: remove unnecessary strtolower() calls
closes #2371
2018-08-13 13:18:58 +01:00
Dylan K. Taylor
a8811ab2b3 Fixed 1.5.0 PlayerSkinPacket protocol change that somehow disappeared
I am 100% sure I committed this change, but it isn't in the merge...
2018-08-11 19:59:44 +01:00
Dylan K. Taylor
974583a853 Merge branch 'release/3.0' into release/3.1 2018-08-11 19:37:10 +01:00
Dylan K. Taylor
03f8fe62d4 Fixed structure of GuiDataPickItemPacket
this changed in 1.2.0.7 beta and I didn't spot it.
2018-08-11 19:36:53 +01:00
Dylan K. Taylor
699f35cc05 Merge branch 'release/3.0' into release/3.1 2018-08-07 18:49:06 +01:00
Dylan K. Taylor
8fa196efc9 FallingBlock: fixed state not being saved 2018-08-07 18:48:52 +01:00
Dylan K. Taylor
b1ab881b99 Merge branch 'release/3.0' into release/3.1 2018-08-07 14:32:28 +01:00
Fris
69c54e789a Clear the title bar when the server shutdown. 2018-08-07 14:31:39 +01:00
Dylan K. Taylor
e33d1279fa Merge branch 'release/3.0' into release/3.1 2018-08-06 18:45:01 +01:00
Dylan K. Taylor
9e1fa453ad Level: Fixed leak of global packets when no players are online
If a global packet was broadcasted when no players were online, it would be held in memory indefinitely (until a player joined).
2018-08-06 18:44:53 +01:00
Dylan K. Taylor
6a05edb4e9 Merge branch 'release/3.0' into release/3.1 2018-08-05 11:33:02 +01:00
Dylan K. Taylor
70635d0870 DropItemAction: Consider invalid if the target item is null
it's not possible to drop a null item.
2018-08-05 11:32:50 +01:00
Dylan K. Taylor
46bd096f06 3.1.4 is next 2018-08-04 16:46:51 +01:00
Dylan K. Taylor
51a8905fb3 Release 3.1.3 3.1.3 2018-08-04 16:41:16 +01:00
Dylan K. Taylor
f954d7c3dc Bring 3.1 up to speed with 3.0 2018-08-04 16:40:40 +01:00
Dylan K. Taylor
7ad0aa56b1 3.0.11 is next 2018-08-04 16:39:53 +01:00
Dylan K. Taylor
1ff6f8846e disable dev flag 3.0.10 2018-08-04 16:30:23 +01:00
Dylan K. Taylor
e6f53cc56b Merge branch 'release/3.0' into release/3.1 2018-08-03 20:07:46 +01:00
Dylan K. Taylor
87f458f9bd AsyncPool: remove now-unnecessary isTerminated() call 2018-08-03 20:07:37 +01:00
Dylan K. Taylor
5a7e575c3a AsyncPool: isCrashed() now returns true when a fatal error occurred
the fix for chunks earlier didn't fix...
2018-08-03 20:06:41 +01:00
Dylan K. Taylor
20b37d0208 Merge branch 'release/3.0' into release/3.1 2018-08-03 18:50:14 +01:00
Dylan K. Taylor
d6d98183ea MainLogger: Log messages and exception traces in a synchronized block
this ensures that stack traces are emitted coherently without messages from other threads landing in the middle.
2018-08-03 18:50:06 +01:00
Dylan K. Taylor
89cf76363f Merge branch 'release/3.0' into release/3.1 2018-08-03 18:24:36 +01:00
Dylan K. Taylor
9ff5c65fb6 Level: Make async chunk sending aware of faults
Previously any random error could occur during an AsyncTask preparing a chunk, and the Level would never know about it and thus never send the chunk.

I don't know how many invisible-chunk bug cases this fixes, but I expect it's quite a lot.
2018-08-03 18:23:32 +01:00
Dylan K. Taylor
1532b0ef6d Level: Remove chunks from chunk send queue on unload
When a chunk request task crashes, these can get stuck and never get removed. This allows using /gc to collect the bad chunk in order to fix the bug.
2018-08-03 18:04:56 +01:00
Dylan K. Taylor
61accee682 Merge branch 'release/3.0' into release/3.1 2018-08-02 14:43:44 +01:00
Dylan K. Taylor
9ece971a2b Server: remove useless check from exceptionHandler()
this cannot be null... @shoghicp y u litter the code with these useless checks ???
2018-08-02 14:41:28 +01:00
Dylan K. Taylor
5546c88f88 Server: Fixed parse errors getting reported to CA
this changed to throwing errors as of PHP 7
2018-08-02 14:40:36 +01:00
Dylan K. Taylor
4c4761d200 back to dev 2018-07-30 15:21:10 +01:00
Dylan K. Taylor
5492495d38 disable dev flag 3.1.2 2018-07-30 15:10:12 +01:00
Dylan K. Taylor
6bef07db7c Empty merge of 3.0 into 3.1 2018-07-30 15:09:53 +01:00
Dylan K. Taylor
e8c7ae595d back to dev 2018-07-30 15:08:32 +01:00
Dylan K. Taylor
0d9f40873f disable dev flag 3.0.9 2018-07-30 14:57:51 +01:00