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
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
Jamie Mansfield
29831c0399
Merge upstream. Fixes #173
2017-09-16 12:47:11 +01:00
Jamie Mansfield
c676a410b0
Merge upstream
2017-09-05 18:17:15 +01:00
Jamie Mansfield
2e32a81429
Merge upstream. Closes #171
2017-09-03 19:55:05 +01:00
kashike
178e989894
Merge upstream
...
Resolves #170
2017-08-18 02:40:00 -07:00
Jamie Mansfield
34068e62d8
Merge upstream. Closes #167
2017-08-13 16:08:33 +01:00
Jamie Mansfield
5b488566be
Fix broken build
2017-08-10 22:40:40 +01:00
Jamie Mansfield
cc7e494098
Merge upstream
2017-08-09 01:20:45 +01:00
Jamie Mansfield
2b302da76c
Merge upstream
2017-08-04 14:57:11 +01:00
Jamie Mansfield
a90dae10c9
Merge upstream - Minecraft 1.12.1 support
2017-08-03 16:50:26 +01:00
Nate Mortensen
c7cd61c968
Make usage of the Netty DNS resolver configurable
...
This adds a new configuration value "use_netty_dns_resolver", which
defaults to true. This allows users to opt out of Netty's DNS
resolver if they encounter any issues with it.
2017-07-26 22:42:21 +01:00
Daniel Naylor
6b33c62e14
Fix some forge plugin message packets not being forwarded correctly
...
This fixes #155 , see SpongePowered/SpongeForge#1507
2017-07-17 20:37:20 +01:00
Jamie Mansfield
8edae227f6
Merge upstream
2017-07-09 00:24:38 +01:00
Troy Frew
6ab69de258
upstream merge 9b3b42316f25a84530e3bbc8b3887ced4ad9838c
2017-07-04 16:20:09 -04:00
Troy Frew
1c98857249
merge upstream daac8d85e20baed2ee0107ee637d0e82af8b2cd1
2017-07-04 16:06:59 -04:00
Jamie Mansfield
03bdb50116
Merge upstream + Fix build
2017-06-21 22:19:45 +01:00
Jamie Mansfield
3b5e511743
Merge upstream
2017-06-18 16:03:06 +01:00
Jamie Mansfield
0a0f6974f3
Implement changes proposed in #124
2017-06-10 20:57:00 +01:00
Jamie Mansfield
cb4d5effb9
Merge upstream - Minecraft 1.12 support
2017-06-08 16:58:07 +01:00
BlackHole
ad3bf933b8
Use correct packet ids for 1.12-pre5
2017-05-22 20:12:17 +01:00
Jamie Mansfield
9432ed7e40
Merge upstream - Minecraft 1.12-pre5 support
2017-05-19 21:51:18 +01:00
Black Hole
474774102e
Use correct packet ids for 1.12-pre2 ( #135 )
2017-05-15 08:54:56 -07:00
Jamie Mansfield
710c45640c
Resolve previous bad merge - opps
2017-05-14 16:20:22 +01:00
Jamie Mansfield
db05bbac39
Merge upstream - Minecraft 1.12-pre2 support
2017-05-14 15:07:38 +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
Jamie Mansfield
bfb622eb23
Merge upstream
2017-04-26 17:32:42 +01:00
Jamie Mansfield
6cd013ce1d
Move 'raw hex dump for rewrite fails' patch to fire-pit
2017-04-09 22:19:14 +01:00
Jamie Mansfield
78a8edd2da
Resolve the import statements I reordered a while back
2017-04-08 15:26:20 +01:00
Techcable
b5ed82d599
Dump a packet's raw hex if entity rewriting fails.
2017-04-07 20:21:19 -07:00
Jamie Mansfield
8ff8de0fbd
Merge upstream
2017-03-11 11:12:59 +00:00
Jamie Mansfield
53eade81e8
This commit is dedicated to JetBrains
...
Yep, I had thought no merge conflict was odd - didn't think much of it. Jetbrains ffs fix the refresh to actual bloody refresh!
2017-03-07 21:28:08 +00:00
Jamie Mansfield
1073945fba
Merge upstream
2017-03-07 21:25:35 +00:00
Jamie Mansfield
32a7625f4f
Update upstream
2017-02-07 22:39:22 +00:00
Jamie Mansfield
91d537c7cc
Update upstream
2017-02-01 20:49:23 +00:00
Techcable
7e1c6381ee
Merge upstream
2017-01-17 08:05:13 -07:00
kamcio96
228318425b
Fix #113
2017-01-17 07:55:53 -07:00
kamcio96
0285fa1808
Improve connection closing, fixing the kick delay.
...
Taken from WaterfallMC/Waterfall-Old@b8845c4edb
@kamcio96 claims that these channel closing changes are removing the
need of delayed kick packets
@Janmm14 can confirm this (at login state) on a no-latency and
low-latency connection (<1ms; ~16ms), high-latency connection was not
tested, but it should work on these too.
Fixes WaterfallMC/Travertine#25
2017-01-15 09:57:49 -07:00
Techcable
575f88841c
Include the cause exception of an DecodingError
...
Add a newline to make things prettier.
2017-01-15 09:38:49 -07:00
Tux
bec652093f
Merge with upstream
2016-12-24 01:36:32 -05:00
Tux
41ec1b302a
Assorted security improvements
...
We should consider using a stronger RSA key as well.
2016-12-21 04:09:09 -05:00
Tux
6fc2170f21
Don't aggressively trim LowMemorySets
...
This only add complexity.
2016-12-21 03:43:00 -05:00
Tux
2dd82be3f1
Use async Netty DNS resolver
2016-12-21 03:15:02 -05:00
Tux
722e89f245
Updated Waterfall to Minecraft 1.11.1
2016-12-21 02:34:59 -05: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
Jamie Mansfield
ea2c109864
Make waterfall-super the parent of waterfall-parent
2016-12-04 17:31:55 +00:00
Jamie Mansfield
cbe6a1b3f5
Reinstate patch to prevent Kick during Handshake
...
Remove redundant patch from fire-pit
2016-12-04 16:42:27 +00:00
Jamie Mansfield
5e0e224df5
Fetch modules from @Z750's CI until Aquifer's is back up
2016-12-03 21:41:35 +00:00
Jamie Mansfield
c8fe40d640
I'm and idiot
2016-11-26 20:39:19 +00:00
Jamie Mansfield
bcad1e9b55
No need to relocate the metrics class
...
Different version of Git were constantely changing the Metrics patch - it wasn't worth it
2016-11-26 20:34:59 +00:00
Techcable
dd44f67c81
Merge upstream
...
Fixes #101
2016-11-24 21:31:39 -07:00
Jamie Mansfield
9fb1a1f574
Merge upstream
2016-11-14 22:46:55 +00:00
Jamie Mansfield
b4498e1368
Merge upstream
2016-11-14 21:09:12 +00:00
Jamie Mansfield
65bfdc7fe1
Merge upstream, Minecraft 1.11 Support
2016-11-14 17:04:25 +00:00
Jamie Mansfield
6d3a02cba2
Amend patch author
...
This is the last time we will be amending the patch authors, unless an author hasen't been credited properly.
2016-11-06 14:23:42 +00:00
Jamie Mansfield
0366c3751a
Merge upstream. Closes #99
2016-11-06 10:17:17 +00:00
Jamie Mansfield
d2d44264d2
Correct the author of the ServerKickHook patch
...
It was brought to our attention by the original author.
2016-11-06 09:49:42 +00:00
Jamie Mansfield
51993973fc
Remove redundant patch. Fixes #98
...
Upstream resolved the issue 3a0b0aa116
2016-11-01 15:51:42 +00:00
Troy Frew
59f69a69c5
Upstream Merge
2016-10-30 10:46:05 -04:00
Techcable
124a8b6213
Fix ArrayIndexOutOfBoundsException in LowMemorySet
...
Fixes #86
2016-10-29 05:53:37 +00:00
Troy Frew
a1e3ee4799
Updated upstream. Moved our Disconnection patches to the fire-pit as there is some duplicate features from BungeeCord provided now.
2016-10-25 12:57:11 -04:00
Jamie Mansfield
44f56d895b
Update upstream
2016-10-11 22:45:06 +01:00
Aaron Hill
bd6cfa1dfc
Properly map EntityEffect for 1.9.0/1.9.2 ( #92 )
2016-09-16 20:59:47 +01:00
Aaron Hill
40e2465947
Fix rare potion race condition with forge 1.8.9 ( #73 )
2016-09-15 21:43:27 +01:00
Jamie Mansfield
ea1d5fd3a6
Remove duplicate dependency
2016-08-30 22:30:01 +01:00
Jamie Mansfield
a5c3110642
Update pom
...
- Update developers list
- Update ci link
2016-08-30 18:38:26 +01:00
Jamie Mansfield
1d27a880c3
Update upstream
...
upstream finnaly caught up on those netty versions :D
2016-08-30 18:30:38 +01:00
Jamie Mansfield
80bed7979d
Remove Event4J patch temporarily
...
Its apparently the cause of many issues we are currently having
2016-08-28 21:23:49 +01:00
Jamie Mansfield
1e10ca1c09
Update upstream
2016-08-26 10:05:00 +01:00
Jamie Mansfield
d6532d31f7
Update upstream
...
Hopefully this has worked. I did it rather quickly during the break of American Dad and on mobile data. This is also my first commit from this Ubuntu installation :D
2016-08-22 22:31:34 +01:00
Jamie Mansfield
21360f278d
Fix modified imports
2016-08-20 21:34:49 +01:00
Jamie Mansfield
12baa16bbf
Update upstream
2016-08-20 21:12:37 +01:00
Jamie Mansfield
d983224c69
Set module author to WaterfallMC
2016-08-17 01:21:26 +01:00
Jamie Mansfield
d1b744857b
Update upstream
2016-08-16 00:47:02 +01:00
Jamie Mansfield
c369fa9f30
Fix the CI links
2016-08-12 19:41:16 +01:00
Techcable
10a81df944
Dump the raw hex of a packet on a decoding error
2016-08-04 19:31:30 -07:00
Techcable
29fc3a8f52
Update upsteram
2016-08-04 19:11:26 -07:00
Troy Frew
5e70cbd859
Upgrade to Netty 4.1.4.Final and remove depracated patch.
...
fixes #67
2016-07-31 14:02:30 -04:00
Troy Frew
2f7ff90ecc
Update upstream
2016-07-31 13:59:30 -04:00
Troy Frew
9f45b24f77
waterfall-chat is under io.github.waterfallmc
2016-07-16 22:38:31 -04:00
Troy Frew
abe3f78e85
Fixed missed change in log/pom.xml
2016-07-16 22:33:11 -04:00
Troy Frew
f04680f98e
Update upstream. Fixup patch files for new log module and other changes from upstream. Update netty to 4.1.3.Final
2016-07-16 21:12:39 -04:00
Troy Frew
1056d858fa
Reverted Store-last-known-dimension-and-don-t-send-useless-re patch. This patch needs additional work before it is ready for general usage. There are multiple issues with client first connection and client kicks.
2016-07-16 20:45:23 -04:00
Jamie Mansfield
e84b7f2f33
Fix timeout variant patch
2016-07-03 21:53:51 +01:00
Jamie Mansfield
d9420aa63b
Fetch modules from the correct CI
2016-07-03 21:40:10 +01:00
Troy Frew
1cf5557c48
Added more stuff from old Waterfall
2016-07-03 04:07:00 -04:00
Troy Frew
3bf13e6dba
Configurable server version in ping patch ( #45 )
2016-07-01 00:28:19 -05:00
Troy Frew
74d5a3ca34
Fix https://github.com/WaterfallMC/Waterfall/issues/52
2016-07-01 00:05:23 -05:00
Black Hole
1e2071e6a8
Since servers is mutable, lock on another Object: serversLock ( #42 )
...
* Since servers is mutable, lock on another Object: serversLock
* Make serversLock final
2016-06-29 19:54:36 -05:00
fuzzybot
a7acead907
Fixed ci link
2016-06-29 19:54:36 -05:00
Jamie Mansfield
2a9bac3c50
Update upstream ( #41 )
2016-06-29 19:54:36 -05:00
Troy Frew
68fa9d3c9f
Fire ServerKickEvent server crashes or shuts down too fast
...
Include the cause of the kick
Merges #39
2016-06-29 19:54:36 -05:00
PunKeel
1720a14e08
Store last known dimension and don't send useless respawn packets
...
Improves server switching without lossing the advantages of the Respawn package (reset entities, for instance)
Merges SpigotMC/BungeeCord#1426
2016-06-29 19:54:36 -05:00
Troy Frew
87ac8b1929
Remove nuneeded import in the netty 4.1 patch
...
Fixes #31 and merges #38
2016-06-29 19:54:35 -05:00
Troy Frew
34de9687e1
Add dynamic server addition/removal api patch ( #37 )
2016-06-29 19:54:35 -05:00
Jamie Mansfield
19c4c95325
Update upstream
...
Merges #25
2016-06-15 09:02:53 -07:00
Techcable
d5d0edbadd
Sleep deprevation is good because it keeps syntax errors in business
2016-06-08 23:12:58 -07:00
Techcable
629ab1e0b1
Updade bungeecord and use their 1.10 support
2016-06-08 23:08:37 -07:00
DoctorDark
d4938e82fe
Re-add the feature to let the console to tab complete commands
...
Fixes #16
2016-06-08 12:13:46 -07:00
joserobjr
06af55a425
Add support for Minecraft 1.10
...
Merges SpigotMC/BungeeCord#1881
2016-06-08 11:33:35 -07:00
Techcable
2de1d93d7f
Don't send KICK packets while in HANDSHAKE state
...
Fixes #12
Use a switch statement for checking if the state has a kick packet for better readibility.
2016-06-06 13:37:58 -06:00
Techcable
c5752cf13d
Give more information when to get packet id to help debug #12
2016-06-06 11:41:33 -06:00
Techcable
ca92e83419
Try and fix build
2016-05-31 13:11:28 -06:00
Techcable
2187ad029c
Always CAS the disconnecting variable when we disconnect.
...
When we changed the disconnect check to use proper concurrent behavior (using CAS), the disconnecting flag wasn't set the first time we disconnect because the OR short-circited the CAS.
Upstream doesn't have this issue because they don't set the flag in the if statement (with CAS), and therefore aren't short circuted.
I have no idea why this check was an OR statement in the first place, so maybe this will cause more crazy bugs.
2016-05-31 12:52:17 -06: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
