Commit Graph

2632 Commits

Author SHA1 Message Date
Aikar 3ecd084ba8 Fix Anvil Level sync to client
https://hub.spigotmc.org/stash/projects/SPIGOT/repos/craftbukkit/commits/763827668e6e5cddc111f3c93a0d718fec21ff51

Was done incorrectly and is now causing level desyncs to client.

Always send current level to the client, and instead make setWindowProperty set the level.
2017-07-11 23:23:17 -04:00
Zach Brown 151f805d3f Merge pull request #785 from electronicboy/master 2017-07-10 08:30:55 -05:00
Shane Freeder 43d46feb48 Update B/CB 2017-07-10 14:04:41 +01:00
Riley Park 69ca425536 Merge pull request #781 from electronicboy/master
Merge upstream!
2017-07-09 03:12:19 -07:00
Shane Freeder b1c4f49c7a Update C 2017-07-09 10:56:36 +01:00
BillyGalbreath 99f530c937 Add Entity#fromMobSpawner API
Merges and closes GH-752
2017-07-09 01:38:30 -05:00
Zach Brown 5ad5423102 Merge pull request #771 from electronicboy/master 2017-07-03 15:42:22 -05:00
Shane Freeder 6e57283e32 Fix javadoc warnings 2017-07-03 16:38:49 +01:00
Zach Brown 65daf84cdb Block player logins during server shutdown
Adds GH-765
2017-07-02 21:37:56 -05:00
Zach Brown f63f531f42 Make timings more tolerant of corrupt chunks
Fixes GH-744
2017-07-02 20:54:29 -05:00
Aikar 61bbe8c3b3 Update upstream 2017-06-30 18:13:06 -05:00
Aikar 70d35b0de5 Update upstream, pretty important bug fix 2017-06-25 21:49:36 -04:00
Aikar 46e300045a Update upstream 2017-06-25 20:26:00 -04:00
Aikar b8fb29dc77 SPIGOT-3381: Alias SWEEPING to SWEEPING_EDGE 2017-06-25 19:40:06 -04:00
Zach Brown e644762d67 Update upstream S
Fixes build
2017-06-25 18:37:00 -05:00
Zach Brown 3f5b488720 Update upstream B/CB 2017-06-25 18:00:32 -05:00
Zach Brown 7409728bf3 Update upstream CB 2017-06-24 13:52:44 -05:00
Aikar fe6fa3846a Update upstream 2017-06-22 23:14:20 -04:00
Zach Brown 604b92968e Update upstream B/CB/S 2017-06-21 22:12:40 -05:00
Zach Brown cc32d61141 Merge pull request #759 from Minecrell/fix-color-encoding 2017-06-21 12:22:19 -05:00
Minecrell 39235e607d 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 10:46:18 +02:00
Aikar 95ae0890a6 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 104b4ec3ae Fix Lootable bug 2017-06-20 18:59:18 -04:00
Aikar 285746c465 update upstream 2017-06-20 18:53:55 -04:00
Zach Brown 1c208bf05b Update upstream CB/S 2017-06-18 20:36:55 -05:00
Aikar 43e2c9c48c 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 17:15:25 -04:00
sweepyoface 5d51c00fac Add UnknownCommandEvent (#746) 2017-06-17 20:53:31 -04:00
Aikar 60177fdfaf Shoulder Entities Release API
Let's you eject the Parrot naturally and get the newly spawned Parrot.
2017-06-17 15:20:25 -04:00
Zach Brown 7b4fe3ed73 Update upstream CB 2017-06-17 14:18:29 -05:00
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