Commit Graph

502 Commits

Author SHA1 Message Date
Shane Freeder
04edf2ee50 fix dangling fixup patch 2019-03-03 01:47:29 +00:00
Shane Freeder
f23ec52afd Handle empty minecraft packets
Actually detect this and print a message instead of just
throwing exceptions down the line, also includes support
for the "allow empty packets" for completeness, but,
follows the same set of recommendations.
2019-02-26 20:48:23 +00:00
Shane Freeder
f2cd0938da 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:
e2bc7ed7 Misc formatting fixes
9133a6f5 Simplify packet registration
2019-02-26 19:53:11 +00:00
Shane Freeder
0874931518
Updated Upstream (BungeeCord)
Also, pulled in papers upstreamCommit script to provide more consistency and information
across the project

BungeeCord Changes:
6d6fbb5e Fix two minor formatting issues
0d6f3ee3 Make 1.13 command injection normal functionality
2019-02-20 18:56:38 +00:00
Shane Freeder
09ef1a5613
Update BungeeCord 2019-02-03 18:06:37 +00:00
Shane Freeder
7dd259045b Update BungeeCord 2019-01-31 22:24:13 +00:00
kashike
178c3a1de5 Update BungeeCord 2019-01-24 22:16:40 -08:00
Shane Freeder
255b419646
Provide an option to disable entity metadata rewriting (fixes #136)
Closes #309

The work here is derived from the research and guidance of
various members of the minecraft community

This patch provides the ability to disable entity remapping,
which creates various incompatability issues with mods, however,
may also create various issues with mods which do not support this,
hence why the configuration option is provided.

This patchs changes will be disabled by default, as we do not
wish to release an update which may cause certain issues with mods
and plugins by default when this is not essential, however, this
is subject to be changed in the future.
2019-01-19 20:04:41 +00:00
Shane Freeder
47ee48d1fc
Fix missing return in previous commit
Doh.
2019-01-17 04:50:19 +00:00
creeper123123321
7f6187dfe1
Don't use a bytebuf for packet decoding 2019-01-17 03:26:52 +00:00
Shane Freeder
2af9e83888
Revert "Fetch version hash from the parent project"
This fails to work consistently due to how maven
seems to resolve this information, hopefully we'll
take another stab at this at a later date
2019-01-16 19:39:20 +00:00
Shane Freeder
dd7f15943d
Fetch version hash from the parent project
This fixes the disparity between the version hash in the version output
vs that in the waterfall repo itself
2019-01-16 18:39:05 +00:00
Shane Freeder
85d4001642
Update jenkins and urls to point towards papermc 2019-01-13 22:17:54 +00:00
Shane Freeder
f3b7697bbf
Update BungeeCord 2019-01-13 20:27:08 +00:00
Shane Freeder
c74411e6dd
Update BungeeCord 2019-01-03 06:07:41 +00:00
Shane Freeder
a177c30d89
Update Bungeecord 2018-12-26 23:40:37 +00:00
Shane Freeder
61b6cadebb
Don't load permissions from waterfall.yml (broken in upstream) 2018-12-21 15:43:20 +00:00
Shane Freeder
6b32122de3
Update Bungeecord 2018-12-21 15:24:26 +00:00
Shane Freeder
bea8aacdbe Merge upstream 2018-12-10 14:02:05 +00:00
Shane Freeder
e34183360f
Actually rebuild patches 2018-11-24 17:08:22 +00:00
Shane Freeder
6a94deed65
Merge upstream 2018-11-24 17:05:29 +00:00
Shane Freeder
e3e6521502 Do not fire an exception for incoming invalid packets
The InitialHandler is exposed to incoming traffic from, ideally, the
minecraft client, however, anything else connecting to this will end
up causing an exception which is spammy and costly to generate, leading
to a significant performance impact in some cases.

We will downgrade this to a log message, which should tell us where the
issue is, and still provide useful information, but will improve the cost
of such cases.
2018-11-18 23:15:44 +00:00
Shane Freeder
0a2275b807 Merge upstream 2018-11-11 12:15:01 +00:00
kashike
12e53fcf76 Drop 'Fix unicode characters in configuration files' patch 2018-11-11 00:40:41 -08:00
Shane Freeder
c4351109e8 Merge upstream 2018-11-04 20:27:05 +00:00
kashike
b52c1ae633
Merge pull request #300 from PaperMC/readme
readme fixes
2018-10-29 10:27:23 -07:00
kashike
e0656ca1d0 readme fixes 2018-10-28 22:48:18 -07:00
Shane Freeder
18911e22ce
Merge upstream 2018-10-27 23:33:50 +01: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
38390d14d0 Merge upstream for 1.13.2 2018-10-22 20:59:47 +01:00
Minecrell
1a303b6d7a Declare shaded JAR as Multi-Release JAR. Fixes #293
Update Log4j to 2.11.1 while I'm at it (unrelated to #293).
2018-10-15 18:47:46 +01:00
Shane Freeder
22ce5f5012
Add Configuration to allow empty packets
This setting provides the ability to allow servers/clients
to send empty packets without kicking the player with an error.

This option is not encouraged or supported in any capacity, and is
provided as a last ditch effort for server owners to allow players
to connect in such a broken state as allowed by vanilla.
2018-10-14 10:47:38 +01:00
Shane Freeder
f48db6b757
Disable tab spam limiter for 1.13+ by default
The changes in 1.13 makes this limiter too easy to hit, breaking tab
completion silently for users and causing a lot of confusion around
tab completions not working, for this reason, it's cleaner to disable
this for 1.13+ clients by default and defer this to the server, where
better control is already provided for paper servers (and any other
server will either not have broken tab completions, or can re-enable
this limit if they wish to do so)
2018-10-06 19:59:28 +01:00
Jamie Mansfield
f7f3cfeb27
Merge upstream; remove fire-pit 2018-09-30 19:17:21 +01:00
Zach Brown
dd0a4d8be8
Update maven POM information
Issue tracker, CI, maven repository deployment
2018-09-29 22:15:31 -04:00
Shane Freeder
757945e1eb give the project some TLC
- Respect bungeecords new "log ping" configuration along side our own
  Waterfalls patch will likely be dropped by the end of the year, migrate!
- Drop 'Don't allow channel buffers to grow beyond a reasonable limit'
  This is already included upstream and is configurable using system properties
- Drop 'Security enhancements for EncryptionUtil'
  This patch is somewhat misguided given how mojangs auth service works and offers
  no real improvements to security
- cleanup some patches
  updated headers for changes which have been removed/extracted into other patches
  cleaned up some code formatting changes in misc sections
- touch up the contributing guide to reflect the recent script changes
2018-09-17 03:07:48 +01:00
Shane Freeder
c56f1321bc Merge upstream 2018-09-10 21:07:54 +01:00
Minecrell
0b5d132185 Consider JUL logger level and filters in Log4JLogHandler 2018-09-04 22:56:54 +01:00
Shane Freeder
5955ede0cb Merge upstream (Closes #282) 2018-09-04 03:12:52 +01:00
Shane Freeder
6125c28a94
Merge upstream - Minecraft 1.13.1 Support
\o/
2018-08-23 22:25:38 +01:00
Jamie Mansfield
a5e6cc087b
Farewell...
Today, Friday 17th August 2018, marks 2 years, 2 months, and 2 days since my first contribution
to the Waterfall project (that’s a total of 792 days!). Throughout that time, 3 major Minecraft
versions have been released, Waterfall has become the go-to for modded networks, and Sponge has
become a very viable option for servers - no longer lacking in implementation.

Before the Bukkit drama, I had written very little software for the server - though I’d written
a bunch of fairly basic client mods. I had run a bunch of servers however - I had very extensive
knowledge of the Classic server software, and I’d run a lot of bukkit servers. Though vanilla
has never really been my cup-of-tea, and ever since I started to do a lot of work with the server
my time playing the game has decreased. The truth is, I’ve never played any of those 3 major
releases that have come out since I’ve been maintaining Waterfall.

Sadly I have fallen out of love with the game, and don’t see myself likely to play it anytime soon.
However, I find a certain joy in writing software so I’ve stuck around - the communities I’ve landed
on are really great :D I’ve found projects to work on that are independent from Minecraft, yet keep
me within the same communities.

Today I work on a lot of software related to obfuscation and Java - namely Lorenz, Bombe, and Survey.
Though I’m also a web developer for Sponge, in addition to a bunch of other roles I’ve landed myself
(including advising a server migrating away from a nearly decade old codebase to Sponge). I’ve
recently been working on a website for some of my friends who are fundraising for charity.

I’ve never really made any money from any of the OSS development I’ve done, amounting to a total of
$30 from a BountySource I did as a one-off. Please don’t take that as a complaint though, I would be
developing software OSS or otherwise - I see it as a hobby, I find it fun. Which is why I’m not longer
the right person to maintain Waterfall - I no longer have need to, or find it fun - in fact merging
upstream changes is a time-consuming, monotonous task :(

Though this may all sound like I’ve hated maintaining Waterfall, which certainly isn’t the case - it's
just how I’ve felt as of late. Frankly, the wonderful community has kept me around for as long as I have.
It’s been really nice to talk to people that I may have fallen out-of-contact with, were it not for
Waterfall.

Maintaining Waterfall has been an honour, and I’m very proud that we’ve become the go-to for modded and
regarded as an analogue to Paper.

And with that, my notifications are going to significantly reduce :D And finally, I’d like to thank
@electronicboy for committing to maintaining Waterfall! Legend :)
2018-08-16 23:06:26 +01:00
Jamie Mansfield
3e170666d7
Merge Upstream
Less than 2 hours till liberation :D
2018-08-16 22:44:14 +01:00
Jamie Mansfield
ac6258c10a
Merge upstream 2018-08-12 14:48:43 +01:00
Shane Freeder
0ad8543546
Merge upstream 2018-08-07 02:15:36 +01:00
Jamie Mansfield
ebdac40aee
Merge upstream 2018-08-05 13:55:22 +01:00
Shane Freeder
3fd1c6f6d8 Merge upstream 2018-07-30 12:54:15 +01:00
Shane Freeder
e910db4871 Drop 1.13 scoreboard api support
Upstream has seemingly decided that they have no
intent of providing proper support for the new scoreboard
changes inside of the bungee API, thus leading many plugins
to have already worked around this.

While having proper API support would be great, shamefully,
plugins which are already working around, which causes
incompatibilies with Waterfall.
2018-07-25 19:10:26 +01:00
Shane Freeder
cc4457473d Ensure that we checkout the submodules before patching(Fixes #262) 2018-07-24 16:57:08 +01:00
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