19e9e0d647
Update upstream
2017-06-09 08:29:44 -04:00
c7f784caf7
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
c829f34e0c
Re: Actually exit the JVM after stopping the server when /restart is ran
2017-06-09 01:46:54 +01:00
5e40806ee2
Remove 1.12 prerelease changes patch
2017-06-08 17:19:12 -05:00
867ddc4ebb
Merge pull request #719 from electronicboy/pre/1.12
...
Do not relocate fastutil
2017-06-08 11:12:51 -07:00
1f626a5ed9
Do not relocate fastutil
2017-06-08 19:07:00 +01:00
77cb896d51
Merge pull request #718 from electronicboy/pre/1.12
...
Update Paper to MC 1.12
2017-06-08 09:37:29 -05:00
3c9f2a0a20
Update Paper to MC 1.12
2017-06-08 15:17:11 +01:00
bd34f2060d
Update upstream B/CB
2017-06-04 15:11:50 -05:00
04d2d38581
Update upstream B/CB
2017-06-02 23:41:05 -05:00
adab11a1f7
Update to 1.12-pre6
2017-05-31 22:12:46 -05:00
a7d4bd3735
Update upstream B/CB
2017-05-29 16:11:54 -05:00
d032cd0568
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
7611b62cf0
Remove unnecessary doclint param on API
2017-05-27 23:36:18 -05:00
066f383b95
Update upstream B/CB/S
2017-05-27 23:25:17 -05:00
9d6bb9d4c8
Bump outdated build notification back out to norm
...
Merge outdated notification patch into existing branding patch
2017-05-26 22:46:27 -05:00
8e2ea2277b
Update upstream B/CB
2017-05-26 22:09:24 -05:00
720769bf30
Update upstream B/S
2017-05-23 17:11:28 -05:00
c1d0b4b4c6
Update Paper to MC 1.12-pre5
2017-05-20 23:49:56 -05:00
7ff16c0197
Merge branch 'master' into pre/1.12
2017-05-18 18:43:21 -05:00
7eb03ca2f6
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
ee2ec9feac
Actually exit the JVM after stopping the server when /restart is ran
2017-05-18 21:15:47 +01:00
ce5d34a9ab
Update test server JVM flags. Bad me not even using my own flags!
2017-05-17 22:51:42 -04:00
210ef18495
Merge branch 'master' into pre/1.12
2017-05-17 17:53:13 -05:00
ca6254067f
Workaround a jansi bug with Windows
...
Update Paperclip too while we're here
2017-05-17 17:51:54 -05:00
6bfe26df49
Update upstream CB
2017-05-17 17:24:58 -05:00
c6e0ceabd7
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
19134fa224
Update upstream B/CB
2017-05-16 17:17:58 -05:00
baf762a2c1
Update upstream B/CB/S
2017-05-15 11:25:20 -05:00
8e610af635
Merge branch 'master' into pre/1.12
2017-05-15 10:57:42 -05:00
1a7f1c5828
Merge pull request #693 from electronicboy/master
...
Allow the watchdog to try sanely stopping the server
2017-05-15 10:46:00 -05:00
a2459e30fd
Allow the watchdog to try sanely stopping the server
2017-05-15 16:36:15 +01:00
6e2332a592
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
491286def4
Update to MC 1.12-pre2
2017-05-14 16:06:27 -05:00
828d600143
Update API patches to MC 1.12pre2
2017-05-14 08:46:44 -05:00
e4f891c95a
Update Paperclip
2017-05-14 04:23:06 -05:00
3052144be8
Update upstream CB
2017-05-13 20:37:46 -05:00
a76ba5c118
Add system property to disable book size limits
2017-05-13 20:26:19 -05:00
2103c75247
Publicly execute the main thread at dawn
...
GH-684
Better handles most true deadlock situations
2017-05-13 06:08:09 -05:00
b0d78d461b
Properly handle async calls to restart the server
...
GH-681
2017-05-12 23:49:59 -05:00
6c3faf6aa3
Update upstream B/CB/S
2017-05-04 18:08:52 -05:00
e9abb69799
Raise book max title length to 32
2017-04-29 20:43:14 -05:00
974b0afca9
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
8b2122a291
Update upstream B/CB/S
2017-04-28 19:25:52 -05:00
157528a29e
Update upstream S
2017-04-25 18:22:29 -05:00
5f3d5d8170
Fix patch conflict with upstream
2017-04-22 17:49:47 -05:00
f68b2ab95e
Update upstream CB/S
2017-04-22 17:41:28 -05:00
f9282c890d
Merge pull request #669 from electronicboy/remove-maps-patch
...
Remove Ignore invalid Marker Icon ID's in maps
2017-04-22 17:39:40 -05:00
ffb572ce9a
Remove Ignore invalid Marker Icon ID's in maps
...
Spigot has patched this issue inside MapIcon, meaning that we no longer need to maintain this patch; Spigots patch also fixes #668 in that it will verify the length of the array, as well as protect against a negative type value being fetched from the array. Only real change is that Spigots patch returns a MapIcon.Type.PLAYER, instead of the RED_MARKER as originally PR'd by Aikar.
2017-04-22 15:52:56 +01:00
7afde8f75f
Use lastIndexOf in Metrics class to futureproof
...
Because who's going to remember to change that line...
2017-04-22 02:37:58 -05:00
Aikar
Zach
Shane Freeder
kashike