Aikar
ce5d34a9ab
Update test server JVM flags. Bad me not even using my own flags!
2017-05-17 22:51:42 -04:00
Zach Brown
210ef18495
Merge branch 'master' into pre/1.12
2017-05-17 17:53:13 -05:00
Shane Freeder
ca6254067f
Workaround a jansi bug with Windows
...
Update Paperclip too while we're here
2017-05-17 17:51:54 -05:00
Zach Brown
6bfe26df49
Update upstream CB
2017-05-17 17:24:58 -05:00
Zach Brown
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
Zach Brown
19134fa224
Update upstream B/CB
2017-05-16 17:17:58 -05:00
Zach Brown
baf762a2c1
Update upstream B/CB/S
2017-05-15 11:25:20 -05:00
Zach Brown
8e610af635
Merge branch 'master' into pre/1.12
2017-05-15 10:57:42 -05:00
Zach
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
Shane Freeder
a2459e30fd
Allow the watchdog to try sanely stopping the server
2017-05-15 16:36:15 +01:00
Zach Brown
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
Zach Brown
491286def4
Update to MC 1.12-pre2
2017-05-14 16:06:27 -05:00
Zach Brown
828d600143
Update API patches to MC 1.12pre2
2017-05-14 08:46:44 -05:00
Zach Brown
e4f891c95a
Update Paperclip
2017-05-14 04:23:06 -05:00
Zach Brown
3052144be8
Update upstream CB
2017-05-13 20:37:46 -05:00
Zach Brown
a76ba5c118
Add system property to disable book size limits
2017-05-13 20:26:19 -05:00
Zach Brown
2103c75247
Publicly execute the main thread at dawn
...
GH-684
Better handles most true deadlock situations
2017-05-13 06:08:09 -05:00
Zach Brown
b0d78d461b
Properly handle async calls to restart the server
...
GH-681
2017-05-12 23:49:59 -05:00
Zach Brown
6c3faf6aa3
Update upstream B/CB/S
2017-05-04 18:08:52 -05:00
Zach Brown
e9abb69799
Raise book max title length to 32
2017-04-29 20:43:14 -05:00
Zach Brown
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
Zach Brown
8b2122a291
Update upstream B/CB/S
2017-04-28 19:25:52 -05:00
Zach Brown
157528a29e
Update upstream S
2017-04-25 18:22:29 -05:00
Zach Brown
5f3d5d8170
Fix patch conflict with upstream
2017-04-22 17:49:47 -05:00
Zach Brown
f68b2ab95e
Update upstream CB/S
2017-04-22 17:41:28 -05:00
Zach
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
Shane Freeder
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
Shane Freeder
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
Zach Brown
2db4e57e4d
Update bStats implementation
2017-04-22 01:16:45 -05:00
Zach Brown
9db28f00db
Update upstream B/CB
2017-04-21 23:42:59 -05:00
Zach
56ba57b210
Merge pull request #663 from electronicboy/player-death-passenger-bug
...
Call stopRiding() on a Players death
2017-04-21 18:06:53 -05:00
Zach Brown
2f7c5949d0
Update upstream CB
2017-04-20 18:12:03 -05:00
Zach Brown
d5cf14188a
Update upstream B/CB
2017-04-20 08:22:40 -05:00
Shane Freeder
674913df0a
Call stopRiding() on a Players death
...
Currently, when a player dies they are not automatically ejected from the entity they are riding, which allows
for the ridden entity to affect the players location on respawn (we're still riding it for a part of a tick), as well as allows a dupe to occur with the ridden entity teleporting to the new world with the player
2017-04-18 15:17:54 +01:00
Zach Brown
63beca49fe
Update upstream B/CB/S
...
Closes GH-658
2017-04-16 17:12:14 -05:00
Zach Brown
362e425271
Update upstream CB/S
2017-04-10 22:11:26 -05:00
kashike
19b5d5b124
Fix NFE caused by attempting to read an EMPTY ItemStack
...
Thanks @gabizou
2017-04-09 23:52:14 -07:00
Zach Brown
6127ca1b6e
Update upstream B/CB
2017-04-04 22:38:08 -05:00
Zach Brown
e4a071f6e4
Update upstream B/CB
2017-03-31 23:24:42 -05:00
Zach Brown
e6a7d357ce
Update upstream CB
2017-03-30 18:26:00 -05:00
Zach Brown
ae17d2c28c
Switch metrics impl to use thread executor service
2017-03-26 18:29:38 -05:00
Zach Brown
5e2784e941
Switch to a bStats based Metrics system
2017-03-25 00:22:02 -05:00
Zach
246712ed92
Merge pull request #628 from willies952002/feature/reloadCommands
...
Don't Display Success Message on Alias Reload Fail
2017-03-24 22:34:13 -05:00
Zach Brown
07d0098a9e
Update upstream B/CB/S
...
Adds /paper command for reloading the paper config.
Closes GH-639
Per-world config logging has been removed in favor of all or nothing
logging for all paper settings. I don't believe it was used enough to
warrant maintaining. If this is not the case it should be possible to
re-add it.
2017-03-24 22:27:43 -05:00
Zach Brown
1d87ea2179
Remove unnecessary blocking of chest minecarts
...
This is already covered by recent changes.
Closes GH-373
2017-03-19 16:17:24 -05:00
Zach Brown
dbabbdbdbe
Update upstream B/CB
2017-03-18 21:01:13 -05:00
Zach
2935dbafdb
Merge pull request #638 from electronicboy/master
...
Ensure that the world of a dead entity is not changed in a portal
2017-03-18 20:47:19 -05:00
Shane Freeder
02afedb602
Ensure that the world of a dead entity is not changed in a portal
2017-03-19 01:33:31 +00:00
Zach
a30343c85e
Merge pull request #636 from electronicboy/paper-maczsh
...
paper tools - fix shell matching
2017-03-17 20:29:42 -05:00
Shane Freeder
1b70427dfc
fix shell match to account for /usr/local for homebrew installs of zsh on macOS
2017-03-17 23:44:58 +00:00
