Zach Brown
76cede4391
Update upstream CB
2017-06-17 14:18:29 -05:00
Zach
fc982f3580
Merge pull request #743 from Minecrell/ignore-eot
...
Continue reading from console input after EOT
2017-06-14 09:31:07 -05:00
Minecrell
ca2b4c592f
Continue reading from console input after EOT
...
There is usually no reason to stop reading from the console, so
preventing console input after EOT can be extremely confusing.
To prevent this, we can simply ignore the exception thrown by
JLine and continue reading normally.
2017-06-14 09:47:10 +02:00
Zach Brown
0a5933b74e
Merge branch 'Minecrell/remove-windows-compat'
2017-06-13 20:34:22 -05:00
Minecrell
56dcc3fcc7
Remove unneeded WINDOWS_COMPAT ConsoleAppender
...
It was originally added in Bukkit/CraftBukkit@6aafe7c5a1 as a
workaround for BUKKIT-4956 to fix console output on Windows.
I believe the original issue was related to LOG4J2-965 and fixed
in apache/logging-log4j2@d04659c . Minecraft 1.12 finally updated
the Log4J version so this issue is no longer present.
Console output is still working fine on Windows after removing this.
2017-06-13 10:36:35 +02:00
Zach Brown
2b51986c25
Update upstream B/CB/S
2017-06-12 22:28:09 -05:00
Zach Brown
cce9b7a866
Update upstream CB
2017-06-11 23:25:44 -05:00
Zach Brown
cb887bb4f4
Renumber patches, fix conflicts, update for 1.12
2017-06-11 20:02:57 -05:00
BillyGalbreath
d6358a6ac1
PlayerAttemptPickupItemEvent ( #732 )
2017-06-11 19:46:11 -05:00
BillyGalbreath
209b70caab
PlayerPickupItemEvent#setFlyAtPlayer ( #683 )
...
* PlayerPickupItemEvent#setFlyAtPlayer
2017-06-11 19:43:59 -05:00
BillyGalbreath
8ad4216e18
EntityPickupItemEvent ( #679 )
...
EntityPickupItemEvent
2017-06-11 19:42:01 -05:00
BillyGalbreath
1ca53dcefe
Item#canEntityPickup ( #680 )
...
Item#canEntityPickup
2017-06-11 19:40:42 -05:00
kashike
ec78d78ee8
Merge pull request #731 from electronicboy/master
...
Provide a configurable option to disable creeper lingering effect spawns
2017-06-11 13:31:32 -07:00
Shane Freeder
06a34ec40a
Provide a configurable option to disable creeper lingering effect spawns
2017-06-11 21:29:04 +01:00
Zach
4eff799e80
Merge pull request #728 from Minecrell/terminalconsoleappender
...
Improve console implementation
2017-06-11 15:12:27 -05:00
Zach Brown
263bd3f539
Update upstream CB/S
2017-06-11 12:03:07 -05:00
Minecrell
de2af506f3
Improve console implementation
...
Rewrite console improvements (console colors, tab completion,
persistent input line, ...) using JLine 3.x and TerminalConsoleAppender.
New features:
- Support console colors for Vanilla commands
- Add console colors for warnings and errors
- Server can now be turned off safely using CTRL + C. JLine catches
the signal and the implementation shuts down the server cleanly.
- Support console colors and persistent input line when running in
IntelliJ IDEA
Other changes:
- Update JLine to 3.3.1 (from 2.12.1)
- Server starts 1-2 seconds faster thanks to optimizations in Log4j
configuration
2017-06-11 14:31:21 +02:00
Zach Brown
fe4678c414
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:12:48 -05:00
Aikar
8121250409
upstream update
2017-06-10 13:14:52 -04:00
Zach Brown
1df56f4369
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
kashike
90b2d02091
Add configuration option to prevent player names from being suggested
2017-06-09 07:32:12 -07:00
Aikar
19e9e0d647
Update upstream
2017-06-09 08:29:44 -04:00
Zach
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
Shane Freeder
c829f34e0c
Re: Actually exit the JVM after stopping the server when /restart is ran
2017-06-09 01:46:54 +01:00
Zach Brown
5e40806ee2
Remove 1.12 prerelease changes patch
2017-06-08 17:19:12 -05:00
kashike
867ddc4ebb
Merge pull request #719 from electronicboy/pre/1.12
...
Do not relocate fastutil
2017-06-08 11:12:51 -07:00
Shane Freeder
1f626a5ed9
Do not relocate fastutil
2017-06-08 19:07:00 +01:00
Zach
77cb896d51
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
3c9f2a0a20
Update Paper to MC 1.12
2017-06-08 15:17:11 +01:00
Zach Brown
bd34f2060d
Update upstream B/CB
2017-06-04 15:11:50 -05:00
Zach Brown
04d2d38581
Update upstream B/CB
2017-06-02 23:41:05 -05:00
Shane Freeder
adab11a1f7
Update to 1.12-pre6
2017-05-31 22:12:46 -05:00
Zach Brown
a7d4bd3735
Update upstream B/CB
2017-05-29 16:11:54 -05:00
Zach Brown
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
Zach Brown
7611b62cf0
Remove unnecessary doclint param on API
2017-05-27 23:36:18 -05:00
Zach Brown
066f383b95
Update upstream B/CB/S
2017-05-27 23:25:17 -05:00
Zach Brown
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
Zach Brown
8e2ea2277b
Update upstream B/CB
2017-05-26 22:09:24 -05:00
Zach Brown
720769bf30
Update upstream B/S
2017-05-23 17:11:28 -05:00
Zach Brown
c1d0b4b4c6
Update Paper to MC 1.12-pre5
2017-05-20 23:49:56 -05:00
Zach Brown
7ff16c0197
Merge branch 'master' into pre/1.12
2017-05-18 18:43:21 -05:00
Zach
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
Shane Freeder
ee2ec9feac
Actually exit the JVM after stopping the server when /restart is ran
2017-05-18 21:15:47 +01:00
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
