Commit Graph

1120 Commits

Author SHA1 Message Date
Zach Brown
9aae84ea43 Block player logins during server shutdown
Adds GH-765
2017-07-02 21:37:56 -05:00
Aikar
a92bce595d Update upstream 2017-06-30 18:13:06 -05:00
Aikar
3244d917f3 Update upstream 2017-06-25 20:26:00 -04:00
Zach Brown
b61aec52a4 Update upstream B/CB 2017-06-25 18:00:32 -05:00
Minecrell
816fa83734 Avoid using System.out for colored messages. Fixes #757
Messages written to System.out are automatically redirected to the
root logger by CraftBukkit. However, before the messages reach the
logger, they are encoded and later decoded again using the standard
system encoding.

On some systems (e.g. FreeBSD), the standard system encoding is
US-ASCII by default, which doesn't support the section sign (§) that
is used for the color codes. Consequently, they will never reach
the formatter that translates them into ANSI escape codes.

There is no reason to write these messages to System.out - it just
adds additional overhead and the encoding problems. We can just log
the messages directly with the root logger.
2017-06-21 11:04:28 +02:00
Aikar
eb67c684d9 Fix Lootable bug 2017-06-20 18:59:18 -04:00
Aikar
825834273c update upstream 2017-06-20 18:53:55 -04:00
Zach Brown
272f130b5a Update upstream CB/S 2017-06-18 20:37:08 -05:00
Aikar
1ebe37e5a3 Profile Lookup Events
Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in profile data, and cache the responses from
profiles that had to be looked up.
2017-06-17 20:57:29 -04:00
sweepyoface
a88fd61a23 Add UnknownCommandEvent (#746) 2017-06-17 20:53:31 -04:00
Aikar
68e8778890 Shoulder Entities Release API
Let's you eject the Parrot naturally and get the newly spawned Parrot.
2017-06-17 15:21:39 -04:00
Zach Brown
76cede4391 Update upstream CB 2017-06-17 14:18:29 -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
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
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
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
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
Shane Freeder
c829f34e0c Re: Actually exit the JVM after stopping the server when /restart is ran 2017-06-09 01:46:54 +01:00
Shane Freeder
1f626a5ed9 Do not relocate fastutil 2017-06-08 19:07:00 +01:00
Shane Freeder
3c9f2a0a20 Update Paper to MC 1.12 2017-06-08 15:17:11 +01: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
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
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
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
Shane Freeder
ee2ec9feac Actually exit the JVM after stopping the server when /restart is ran 2017-05-18 21:15:47 +01: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
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
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
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
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