Commit graph

2587 commits

Author SHA1 Message Date
Zach Brown
3b5e6cd48f Properly fix JavaDoc linting issues
Fixes our own, and upstream's, issues with the stricter Java 8 JavaDoc
linter.

Also removes the destroystokyo-release maven repository. I'm not sure
why I added it originally, but it's unnecessary now.
2017-06-10 17:11:10 -05:00
Aikar
a22ed886b5 upstream update 2017-06-10 13:14:52 -04:00
Zach Brown
6caa4fe122 Go back to disabling javadoc linting for now
It's breaking our maven deployments. This should be fixed properly in
the future when I have more time and have had less to drink.
2017-06-09 19:40:41 -05:00
Riley Park
991082d2a2 Add configuration option to prevent player names from being suggested 2017-06-09 07:29:59 -07:00
Aikar
e68554e5c6 Update upstream 2017-06-09 08:29:44 -04:00
Zach Brown
31eca1627b Merge pull request #722 from electronicboy/master
Re: Actually exit the JVM after stopping the server when /restart is ran
2017-06-08 21:08:40 -05:00
Shane Freeder
1ee4b36a97 Re: Actually exit the JVM after stopping the server when /restart is ran 2017-06-09 01:46:54 +01:00
Zach Brown
bdeb75ada8 Remove 1.12 prerelease changes patch 2017-06-08 17:19:12 -05:00
Riley Park
a1a51ba9c0 Merge pull request #719 from electronicboy/pre/1.12
Do not relocate fastutil
2017-06-08 11:12:51 -07:00
Shane Freeder
36c0415d72 Do not relocate fastutil 2017-06-08 19:07:00 +01:00
Zach Brown
f061b704bd Merge pull request #718 from electronicboy/pre/1.12
Update Paper to MC 1.12
2017-06-08 09:37:29 -05:00
Shane Freeder
8bb457e352 Update Paper to MC 1.12 2017-06-08 15:16:51 +01:00
Zach Brown
30cc65c220 Update upstream B/CB 2017-06-04 15:11:50 -05:00
Zach Brown
74ffc20767 Update upstream B/CB 2017-06-02 23:41:05 -05:00
Shane Freeder
9cf2e3b3dc Update to 1.12-pre6 2017-05-31 09:04:52 +01:00
Zach Brown
529a9626f4 Update upstream B/CB 2017-05-29 16:11:54 -05:00
Zach Brown
9534f437f4 Add more info, triggers to watchdog velocity warn
Adds entity name to exception message
Checks that the velocity to be set is NaN
2017-05-28 00:06:26 -05:00
Zach Brown
d1a100c11e Remove unnecessary doclint param on API 2017-05-27 23:36:18 -05:00
Zach Brown
81159a37d4 Update upstream B/CB/S 2017-05-27 23:25:17 -05:00
Zach Brown
914c16f3b2 Bump outdated build notification back out to norm
Merge outdated notification patch into existing branding patch
2017-05-26 22:46:27 -05:00
Zach Brown
a044ef0e9f Update upstream B/CB 2017-05-26 22:09:24 -05:00
Zach Brown
16113437c6 Update upstream B/S 2017-05-23 17:11:28 -05:00
Zach Brown
b39f2133a1 Update Paper to MC 1.12-pre5 2017-05-20 23:41:39 -05:00
Zach Brown
8fb32efc40 Merge branch 'master' into pre/1.12 2017-05-18 18:43:21 -05:00
Zach Brown
e5315ba7cb Merge pull request #700 from electronicboy/master
Actually exit the JVM after stopping the server when /restart is ran
2017-05-18 18:39:20 -05:00
Shane Freeder
1695252805 Actually exit the JVM after stopping the server when /restart is ran 2017-05-18 21:15:47 +01:00
Aikar
f73ec445b6 Update test server JVM flags. Bad me not even using my own flags! 2017-05-17 22:51:42 -04:00
Zach Brown
43a4d24ea0 Merge branch 'master' into pre/1.12 2017-05-17 17:52:45 -05:00
Shane Freeder
0377b7b862 Workaround a jansi bug with Windows
Update Paperclip too while we're here
2017-05-17 17:51:42 -05:00
Zach Brown
d67b067983 Update upstream CB 2017-05-17 17:24:58 -05:00
Zach Brown
d4441c91ef Add an option to make parrots stick to shoulders
When enabled, Parrots will not fly off of a player's shoulder everytime
they change Y level, touch water, sneeze, etc.
Instead, a player must toggle shift to "shake" the parrots off.
2017-05-16 21:34:47 -05:00
Zach Brown
edfd5eda4f Update upstream B/CB 2017-05-16 17:17:58 -05:00
Zach Brown
f7d8aa4188 Update upstream B/CB/S 2017-05-15 11:25:20 -05:00
Zach Brown
b75e22ccb2 Merge branch 'master' into pre/1.12 2017-05-15 10:57:42 -05:00
Zach Brown
2d3da9ab4b Merge pull request #693 from electronicboy/master
Allow the watchdog to try sanely stopping the server
2017-05-15 10:46:00 -05:00
Zach Brown
22910b09c3 Switch 1.12-pre2 to its own version checks
Fix stream formatting issue that had been bugging me
2017-05-15 10:28:28 -05:00
Zach Brown
ab4ae72fd5 Update to MC 1.12-pre2 2017-05-14 13:05:01 -05:00
Shane Freeder
f3bc708389 Allow the watchdog to try sanely stopping the server 2017-05-14 14:49:56 +01:00
Zach Brown
b712d77d72 Update API patches to MC 1.12pre2 2017-05-14 08:46:44 -05:00
Zach Brown
afaba00192 Update Paperclip 2017-05-14 04:23:06 -05:00
Zach Brown
2c33c8b106 Update upstream CB 2017-05-13 20:37:46 -05:00
Zach Brown
c480f39ff9 Add system property to disable book size limits 2017-05-13 20:26:19 -05:00
Zach Brown
54e5a2e4da Publicly execute the main thread at dawn
GH-684

Better handles most true deadlock situations
2017-05-13 05:51:09 -05:00
Zach Brown
302f743310 Properly handle async calls to restart the server
GH-681
2017-05-12 23:49:59 -05:00
Zach Brown
26d7646a75 Update upstream B/CB/S 2017-05-04 18:08:52 -05:00
Zach Brown
d3f692b39b Raise book max title length to 32 2017-04-29 20:43:14 -05:00
Zach Brown
64b19558b6 Remove last bit of chunk exists region file fix
CraftBukkit removed their implementation that caused this issue,
switching to Mojang's implementation which doesn't appear to share it. I
already removed the important bit in the last upstream merge, this is
just unused and unnecessary now. So we remove it.
2017-04-29 05:27:31 -05:00
Zach Brown
2671b8b308 Update upstream B/CB/S 2017-04-28 19:25:52 -05:00
Zach Brown
d8c3e02ad6 Update upstream S 2017-04-25 18:22:29 -05:00
Zach Brown
6645aa1301 Fix patch conflict with upstream 2017-04-22 17:49:47 -05:00