Commit Graph

554 Commits

Author SHA1 Message Date
Shane Freeder
ed37fdbc41 Merge upstream 2018-07-23 08:12:21 +01:00
Jamie Mansfield
f6788a0886
Disable Metrics 2018-07-22 17:45:31 +01:00
Mariaum
99bc9a7029 Fix scoreboard objectives with 1.13 2018-07-22 15:08:45 +01:00
Mariaum
988361eea9 Fix scoreboard team packet issues 2018-07-22 14:36:46 +01:00
Shane Freeder
35a69a6c42 Merge upstream 2018-07-22 06:42:58 +01:00
Shane Freeder
d1b91271e0 More scoreboard fixes 2018-07-22 01:28:48 +01:00
Shane Freeder
d12ec7493c
Correct field for objectives 2018-07-21 21:51:10 +01:00
Shane Freeder
b354bf04ef Fix team handing inversion 2018-07-21 19:55:56 +01:00
Shane Freeder
b7a2ebe8f5 Handle team display name 2018-07-21 18:51:15 +01:00
Jamie Mansfield
c97fa453e1
Fix broken patch + document edit command 2018-07-21 18:47:04 +01:00
Jamie Mansfield
126c0d88dd
Add waterfall command 2018-07-21 18:42:34 +01:00
Shane Freeder
c8eb6aec7b Handle 1.13 scoreboard objectives/teams properly 2018-07-21 18:13:02 +01:00
Shane Freeder
49ea630d46
Rework 1.13 release protocol support 2018-07-21 17:19:36 +01:00
Jamie Mansfield
c8d3e9b897
Update stale-bot config 2018-07-21 15:32:29 +01:00
Jamie Mansfield
c6c3d3e9b5
Add stale-bot config 2018-07-21 13:51:53 +01:00
Shane Freeder
1d3fae9d1d
Pull back 1.13 release protocol support from Travertine 2018-07-20 19:36:07 +01:00
Minecrell
56b617c361 Update TerminalConsoleAppender to 1.1.1
See https://github.com/Minecrell/TerminalConsoleAppender/releases/tag/1.1.1
2018-07-20 18:07:23 +01:00
Shane Freeder
578418c4f2
Merge upstream 2018-07-20 02:30:56 +01:00
Mark Vainomaa
3d4d154926 Copy license files into jar
Solves issue #201 with including the BungeeCord LICENSE file
in binary distribution, as the license requires.
2018-07-18 18:47:50 +01:00
Minecrell
f8cc726520 Set up Log4j 2 async loggers using system property
From the Log4j 2 documentation:

  When AsyncLoggerContextSelector is used to make all loggers asynchronous,
  make sure to use normal <root> and <logger> elements in the configuration.
  The AsyncLoggerContextSelector will ensure that all loggers are
  asynchronous, using a mechanism that is different from what happens when
  you configure <asyncRoot> or <asyncLogger>. The latter elements are
  intended for mixing async with sync loggers.

https://logging.apache.org/log4j/2.x/manual/async.html

Since we are not using mixed sync/async loggers, we should use the
system property to enable the async loggers.
2018-07-18 16:12:17 +01:00
Minecrell
223b748b87 Update to TerminalConsoleAppender 1.1.0
Fixes a long-standing race condition in TerminalConsoleAppender,
that eventually resulted in IllegalStateExceptions or duplicate
input prompts.

Fixes #242, Fixes #188
2018-07-18 09:33:43 +01:00
BlackHole
6a77c81ac1
Merge upstream - Minecraft 1.13-pre7 support 2018-07-15 13:16:15 +01:00
Jamie Mansfield
8d79956adc
Merge upstream 2018-07-13 00:03:16 +01:00
Jamie Mansfield
a40c225a66
Merge upstream 2018-07-09 10:12:55 +01:00
Minecrell
3d3ab27dcf Avoid stopping if already in progress
Currently it is possible to stop the proxy multiple times, causing
the shutdown routines to be called twice. This doesn't make any
sense and may even cause problems with some plugins.

Cancel early if stopping is already in progress to avoid this.
2018-07-07 00:25:36 +01:00
Minecrell
6ae43560bc Disable JLine event expansion
Fixes PaperMC/Paper#1171 for Waterfall
2018-06-25 16:49:48 +01:00
Jamie Mansfield
c104978744
Merge upstream 2018-06-21 17:31:28 +01:00
Shane Freeder
8ad3bf6da2
Merge upstream 2018-06-21 03:41:48 +01:00
Shane Freeder
81679f3584
Merge upstream 2018-06-09 12:00:26 +01:00
Shane Freeder
00a145e10f
Merge upstream (closes #233) 2018-06-06 11:17:32 +01:00
Zach Brown
ab76a255e5 Update Maven Deploy URL
We recently moved some things around and as a result several URLs
changed.

Redirects are in place and most users will not need to make any changes.
We have already tested and confirmed that maven access works just fine
via the redirects.

However, maven will not allow you to deploy through the redirect so
projects using old deploy URLs will need to be updated.
2018-05-28 23:43:32 +01:00
Jamie Mansfield
f539c023a3 Merge upstream 2018-05-28 22:00:27 +01:00
Jamie Mansfield
aab96dc7e8 Merge Bungeecord#e93323d 2018-05-28 21:53:01 +01:00
Jamie Mansfield
7385da83cf
Merge upstream 2018-04-23 21:04:05 +01:00
Jamie Mansfield
4f0d50aac3
Merge upstream 2018-04-14 12:09:17 +01:00
Shane Freeder
58127189ff
Merge upstream 2018-04-02 10:21:24 +01:00
Jamie Mansfield
5882e0a157
Merge upstream 2018-03-20 20:24:14 +00:00
Shane Freeder
804cb0dd79
Merge upstream 2018-03-14 14:55:00 +00:00
Jamie Mansfield
5afcff9279
Merge upstream 2018-03-07 22:55:25 +00:00
Jamie Mansfield
d4bcbb1140
Merge upstream 2018-03-05 21:07:50 +00:00
Jamie Mansfield
1932de511c
Merge upstream 2018-03-03 18:05:19 +00:00
Jamie Mansfield
19d850ebb1
Merge upstream 2018-02-20 13:20:51 +00:00
Gabriele C
4c55f25c9c
Optionally log InitialHandler connections (#206) 2018-02-20 13:17:20 +00:00
Jamie Mansfield
641c851948
Merge upstream 2018-02-07 21:08:37 +00:00
Shane Freeder
4ea50d7023 Merge upstream 2018-01-28 11:36:01 +00:00
Jamie Mansfield
20067373f3
Merge upstream 2018-01-08 17:32:30 +00:00
Jamie Mansfield
035090d894
Resolve broken build 2018-01-07 17:27:31 +00:00
Jamie Mansfield
7fcb9fbf8c
Merge upstream 2018-01-07 17:04:30 +00:00
phenomax
9f73d70f15
Providing access to the player's LoginResult on LoginEvent 2017-12-30 22:20:25 +00:00
Jamie Mansfield
b477eba646
Merge upstream
bungeecord-ref: dda0638869
2017-12-30 21:57:10 +00:00