Commit graph

2642 commits

Author SHA1 Message Date
Zach Brown
b7336e0204 Update upstream CB 2017-07-24 06:47:43 -05:00
Zach Brown
9115bf4ca0 Update upstream CB 2017-07-22 20:16:06 -05:00
Zach Brown
77ccedf8fa Merge pull request #793 from electronicboy/master 2017-07-19 18:23:18 -05:00
Shane Freeder
dde8cb0bc6 Update C 2017-07-19 23:02:48 +01:00
Aikar
ca512353fc Remove last patch, didn't resolve issue. 2017-07-16 20:59:39 -04:00
Aikar
892fca2c4c SPIGOT-3427: Recalculate ConsoleSender permissions after plugins have loaded
Resolves a really weird race condition where the console sender could lose permission to execute
commands defined in plugin.yml with default=op
2017-07-16 20:41:30 -04:00
Aikar
a289bd5949 Update upstream (memory leak fix) 2017-07-16 20:36:27 -04:00
Zach Brown
8bc0a37de6 Port Sponge's heap dump command feature to Paper
To dump the server heap, run the following command:
`/paper heap`

This is added with the intent that it is useful for administrators and
developers to more easily identify and resolve memory leaks. Both by examining
these dumps themselves and by more easily allowing them to send them to
knowledgable parties.

This is a nearly line-for-line port of the same Sponge feature. So all
credit for the idea and implementation belongs to the that team.

Specifically the following commits:
be08be04b0
5e10a1b795
2017-07-15 18:59:18 -05:00
Zach Brown
e35d569526 Update upstream CB 2017-07-15 14:57:50 -05:00
Zach Brown
91fbee7d15 Clear plugin metadata only after onDisable()
Fixes GH-776
2017-07-15 14:38:16 -05:00
Aikar
3ecd084ba8 Fix Anvil Level sync to client
763827668e

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