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
Jamie Mansfield
1ef166d6a9
Merge upstream
...
Resolves #193
2017-12-13 21:00:48 +00:00
Jamie Mansfield
e24fdb377e
Merge upstream
...
Resolves #192
2017-12-05 19:14:15 +00:00
Jamie Mansfield
42bc9c39a9
Merge upstream
2017-11-18 18:22:53 +00:00
kashike
66dbf93bab
Merge upstream
...
resolves #190
2017-11-10 15:18:17 -08:00
Jamie Mansfield
60905d7d56
Merge upstream
2017-11-10 17:53:59 +00:00
Minecrell
ef09beba3d
Minor improvements to Log4j configuration that replicates Bungee setup
...
- Remove colons that are not present in Bungee's log file
- Use standard stack traces instead of Log4j's extended stack traces
2017-10-31 18:09:10 +00:00
Jamie Mansfield
71b76653f2
Merge upstream
2017-10-28 20:51:33 +01:00
Jamie Mansfield
b5d048b57a
Revert to BungeeCord behaviour for the 'not direct byte buf' business
...
Not worth the time wasted on closing invalid bug reports.
2017-10-23 19:53:51 +01:00
Jamie Mansfield
4c8715286f
Deploy to destroystokyo mvn repo
...
Thanks @Z750 :D
2017-10-09 20:20:14 +01:00
Minecrell
e1553a3f25
Drop redundant patches for JUL logger
...
Since Waterfall is now using Log4J for logging, these patches no
longer have any effect.
2017-10-09 08:15:44 +01:00
Minecrell
d3dc2d3748
Implement full console command completion
...
Drop the original console command completion patch and rewrite it
for JLine 3. Add support to complete command names instead of just
command arguments.
The additional single thread executor for command completion was
dropped because it's redundant: since the command completer needs
to wait for it to complete anyway, we might as well do the completion
directly from the console thread.
2017-09-26 19:37:34 +01:00
kashike
ab5021987d
Merge pull request #176 from Minecrell/log4j-tca
...
Use Log4j, add console improvements and allow plugins to use SLF4 for logging
2017-09-24 09:12:26 -07:00
Minecrell
ab59b59fd9
Add Log4j configuration that replicates the old BungeeCord setup
...
Can be enabled using -Dlog4j.configurationFile=log4j2-bungee.xml
2017-09-24 15:14:55 +02:00
Minecrell
c75b27a22e
Allow plugins to use SLF4J for logging
2017-09-24 15:14:55 +02:00
Minecrell
d5d18f28b1
Handle plugin prefixes using Log4J
2017-09-24 15:14:55 +02:00
Minecrell
2e698ff9c3
Use Log4J2 for logging and TerminalConsoleAppender for console
2017-09-24 15:14:52 +02:00
Jamie Mansfield
4fc076eefa
Merge upstream
2017-09-23 19:25:31 +01:00
kashike
a0220aa0d4
Merge pull request #175 from lucko/master
...
Merge upstream
2017-09-19 06:25:57 -07:00
Luck
e25b1d8a1d
Merge upstream
2017-09-19 14:08:22 +01:00
kashike
688da25b64
Merge pull request #174 from MineTheCube/master
...
Merge upstream - Minecraft 1.12.2 support
2017-09-18 07:20:30 -07:00
MineTheCube
fd02d88345
Merge upstream - Minecraft 1.12.2 support
2017-09-18 15:53:50 +02:00
Jamie Mansfield
29831c0399
Merge upstream. Fixes #173
2017-09-16 12:47:11 +01:00
