Commit Graph

2872 Commits

Author SHA1 Message Date
kashike
c860de53ec Merge pull request #781 from electronicboy/master
Merge upstream!
2017-07-09 03:12:19 -07:00
Shane Freeder
1e4d3c3106
Update C 2017-07-09 10:56:36 +01:00
BillyGalbreath
e0e23db485
Add Entity#fromMobSpawner API
Merges and closes GH-752
2017-07-09 01:39:09 -05:00
Zach
014578a73b Merge pull request #771 from electronicboy/master 2017-07-03 15:42:22 -05:00
Shane Freeder
18c16a6111
Fix javadoc warnings 2017-07-03 19:54:40 +01:00
Zach Brown
9aae84ea43
Block player logins during server shutdown
Adds GH-765
2017-07-02 21:37:56 -05:00
Zach Brown
b1d34f6180
Make timings more tolerant of corrupt chunks
Fixes GH-744
2017-07-02 20:54:29 -05:00
Aikar
a92bce595d Update upstream 2017-06-30 18:13:06 -05:00
Aikar
7cd81967b4 Update upstream, pretty important bug fix 2017-06-25 21:49:58 -04:00
Aikar
3244d917f3 Update upstream 2017-06-25 20:26:00 -04:00
Aikar
b3d6ec2d26 SPIGOT-3381: Alias SWEEPING to SWEEPING_EDGE 2017-06-25 19:40:34 -04:00
Zach Brown
dedf848bea
Update upstream S
Fixes build
2017-06-25 18:37:00 -05:00
Zach Brown
b61aec52a4
Update upstream B/CB 2017-06-25 18:00:32 -05:00
Zach Brown
4793368f72
Update upstream CB 2017-06-24 13:52:44 -05:00
Aikar
7daa2e11b9 Update upstream 2017-06-22 23:14:20 -04:00
Zach Brown
8a45451a97
Update upstream B/CB/S 2017-06-21 22:12:40 -05:00
Zach
c9f4b402ff Merge pull request #759 from Minecrell/fix-color-encoding 2017-06-21 12:22:19 -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
a96a996213 Allow plugins to override Vanilla commands with aliases
Spigot broke this in 1.12, re-adding the logic back
2017-06-20 18:59:23 -04: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
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