Zach Brown
9a3f146c2e
Merge pull request #743 from Minecrell/ignore-eot
...
Continue reading from console input after EOT
2017-06-14 09:31:07 -05:00
Minecrell
e26d8346bd
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:31:44 +02:00
Zach Brown
a0f46a6932
Merge branch 'Minecrell/remove-windows-compat'
2017-06-13 20:30:08 -05:00
Minecrell
98b036eab0
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:10:22 +02:00
Zach Brown
964e06c9a5
Update upstream B/CB/S
2017-06-12 22:28:09 -05:00
Zach Brown
29bba5da9c
Update upstream CB
2017-06-11 23:25:44 -05:00
Zach Brown
cd7f5199e8
Renumber patches, fix conflicts, update for 1.12
2017-06-11 20:02:57 -05:00
BillyGalbreath
a86bd09bb7
PlayerAttemptPickupItemEvent ( #732 )
2017-06-11 19:46:11 -05:00
BillyGalbreath
899f4969c1
PlayerPickupItemEvent#setFlyAtPlayer ( #683 )
...
* PlayerPickupItemEvent#setFlyAtPlayer
2017-06-11 19:43:59 -05:00
BillyGalbreath
e91f3880b7
EntityPickupItemEvent ( #679 )
...
EntityPickupItemEvent
2017-06-11 19:42:01 -05:00
BillyGalbreath
d1f99dde16
Item#canEntityPickup ( #680 )
...
Item#canEntityPickup
2017-06-11 19:40:42 -05:00
Riley Park
9737df4f65
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
451ff56710
Provide a configurable option to disable creeper lingering effect spawns
2017-06-11 21:13:59 +01:00
Zach Brown
bdd63e020c
Merge pull request #728 from Minecrell/terminalconsoleappender
...
Improve console implementation
2017-06-11 15:12:27 -05:00
Zach Brown
e3dd2d2df2
Update upstream CB/S
2017-06-11 12:03:07 -05:00
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
Minecrell
e0aa38d35e
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-09 19:05:12 +02: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
