Commit Graph

24 Commits

Author SHA1 Message Date
Shane Freeder
cca83dfaf6
Updated Upstream (BungeeCord)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

BungeeCord Changes:
a3ab2bf5 Update checkstyle
adee7bd2 Source jar does not need to fork build
7bd8a027 Always print remote IP in InitialHandler
0cf27a09 Update scriptus
bf673c5d Add pretty colours to console log levels
2235a323 Optimize ColouredWriter slightly
1dee0490 Don't send/construct redundant kick messages
e9ba95b9 Don't log full CorruptedFrameException
d3bd7852 #2762: Work correctly with disabled timeout
3ce4132c Switch keepalive queue to ArrayDeque
ce2dcaf7 #2763: Fix .DS_Store entry in .gitignore
cf72c3a7 Show slow event times in milliseconds
cd7a3ab2 #2758: Improve server list ping response where remote ping failed
0a4b9b49 #2752: Configurable connect and ping timeouts
2020-02-01 15:39:53 +00:00
Shane Freeder
56fd936664
Updated Upstream (BungeeCord)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

BungeeCord Changes:
4bb0fb67 Fix Javadoc in ServerInfo.getSocketAddress
68cc325a #2755: Add ClickEvent.COPY_TO_CLIPBOARD
3d3a5aef Remove unused .travis.yml
2c6a21d5 Remove stray import breaking build
b7e7274b #2750: Don't special case TextComponent constructor with a single extra
b70cb014 Add beta support for binding bungee to unix socket addresses
701391f2 Update Netty to 4.1.45.Final
2020-01-21 17:36:22 +00:00
Shane Freeder
3a793b886c
Updated Upstream (BungeeCord)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

BungeeCord Changes:
d8c222ae Update date
d20e622b Apply checkstyle to javadoc
6c8a0cce Remove m2e settings, causes useless warnings
2f547f73 Fix some javadoc warnings
5f29e939 #2720: Send different log message for pings (vs login)
46521568 #2740: Fix BaseComponent#equals() stack overflow
d2ceccd6 #2725: Various improvements to chat API
7ed4c41d #2723: Improved Send Command
2020-01-06 19:43:23 +00:00
Shane Freeder
69d0c4010d Updated Upstream (BungeeCord)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

BungeeCord Changes:
af10f82d Apply and enforce import ordering rules
3f01748d Minecraft 1.14-pre5 support
2019-04-23 09:09:26 +01:00
Shane Freeder
8f8bdf58a9 Updated Upstream (BungeeCord)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

BungeeCord Changes:
771f1735 Clearer message for illegal IP addresses
4428409d Netty 4.1.34.Final
52a125dd Add --help flag
2019-03-20 03:55:00 +00:00
Shane Freeder
a177c30d89
Update Bungeecord 2018-12-26 23:40:37 +00:00
Shane Freeder
6b32122de3
Update Bungeecord 2018-12-21 15:24:26 +00:00
kashike
12e53fcf76 Drop 'Fix unicode characters in configuration files' patch 2018-11-11 00:40:41 -08:00
Shane Freeder
1c8ea44393
move up Fixup ProtocolConstants to waterfall
This patch contains a trivial formatting fix, while while somewhat
pointless, I decided to keep, the main advantage is in the util
helpers which will aim to keep code cleaner (I've wished for this
to be included in waterfall for a while, and given future work, I
feel now is a good time to shift it over)
2018-10-27 22:18:13 +01:00
Shane Freeder
c56f1321bc Merge upstream 2018-09-10 21:07:54 +01:00
Shane Freeder
5955ede0cb Merge upstream (Closes #282) 2018-09-04 03:12:52 +01:00
Jamie Mansfield
f6788a0886
Disable Metrics 2018-07-22 17:45:31 +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
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
Jamie Mansfield
34068e62d8
Merge upstream. Closes #167 2017-08-13 16:08:33 +01:00
Jamie Mansfield
ec611c5d0a
Merge upstream 2017-05-10 18:54:46 +01:00
Jamie Mansfield
11f46ca049
Merge upstream 2017-04-28 21:22:02 +01:00
Techcable
7e1c6381ee
Merge upstream 2017-01-17 08:05:13 -07:00
Jamie Mansfield
d8d9dc852a
Remove newlines I didn't spot earlier 2016-12-09 23:54:35 +00:00
Mystiflow
4ddfe924e3
Migrate more micro-optimisations from Waterfall-Old 2016-12-09 13:36:42 +00:00
Techcable
05fc872738
Make the Netty 4.1 upgrade one of the first patches
@aikar suggested this so patches don't have conflicts with netty 4.1
2016-05-31 12:49:57 -06:00
Techcable
c6ee5b53a7
Remove uneeded patch and call UUIDUtils.toMojangUUID() directly
Closes #8 even more
2016-05-31 12:46:47 -06:00
phase
f160b2169e Remove unneeded unit tests for unneeded UUID method
getMojangUUID was a replacement for the regex conversion of UUIDs to
Mojang's format. I have removed this method and the associated unit
tests because it is nothing more than a wrapper around String#replace.
This new patch simply replaces the call to String#replaceAll with a
call to String#replace. Patch 0011 was affected by this change, and has
been fixed.

Merges #9
2016-05-31 11:37:52 -06:00
Techcable
3809083007
Turn waterfall into a patch-based fork like Spigot and Paper (WIP)
Allows us to easily see and manage the diff with upstream.
Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history.

All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-30 14:51:51 -06:00