Commit Graph

320 Commits

Author SHA1 Message Date
Shane Freeder
872b8619cb Statically link against mbedcrypto on macOS
This means that users don't have to have these libraries installed on
their system via homebrew for usage.
2019-04-17 02:39:38 +01:00
Colin Godsey
d66a0af471 OSX native zlib and crypto 2019-04-17 02:39:38 +01:00
Shane Freeder
2e1620e860 Make disable-entity-metadata-rewriting config more robust (Closes #361)
While we originally aimed to avoid this, using a system property allows
us to avoid breaking this configuration setting should any plugin
attempt to extend this class
2019-04-09 04:35:23 +01:00
Shane Freeder
a4c1e457e8 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:
5aaccd2e #2621: Fix score component serialization
2019-04-09 04:12:16 +01:00
Shane Freeder
7962b23cbb Drop waterfalls server ping list option
This functionality was adopted by upstream
2019-03-30 18:01:17 +00:00
Shane Freeder
56c18488fe Fix more javadoc issues 2019-03-30 17:18:24 +00:00
Shane Freeder
083479278e Fix javadoc doclint issues
Also, bump javadoc plugin to 3.1.0, as this fixes some local issues with
the javadoc tool not being in the correct place, we're also going to
leave doclint disabled, upstream doesn't seem to care about this too
much, nor do I really feel a super strong need to maintain this.
2019-03-30 16:09:06 +00:00
Shane Freeder
c331e7fd00 Report slow events in milliseconds
nanoseconds is an overly accurate measurement for event handers, and
only ends up confusing and overly worrying people.

milliseconds is a much more normal and expected measurement in the
community, especially when we do not care about nanosecond level
accuracy.
2019-03-26 04:40:06 +00:00
Shane Freeder
ae319ce090 Reuse existing ServerInfo object when reloading config
Prior to this command, greload would replace the ServerInfo stored in
bungee, this leads to the /glist counters being out of sync, but also
potentially highlights futher complications in replacing live server
objects, in that code doesn't generally expect/account for it to occur.

This behavior is not as ideal as being able to use the new server info,
which will have updated settings such as the motd, however, this change
offers better expected behavior.

We may wish to revisit this in the future, e.g. system property to force
using the new objects at the risk of breaking the player count on
reload?
2019-03-26 04:03:01 +00:00
kashike
b346845ec2 Use proper max length for serverbound chat packet 2019-03-20 21:41:13 -07: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
c803d54488 Manually specify deploy plugin version 2019-03-20 03:24:44 +00:00
Byteflux
897f9d63f5 Aggregate API and Chat Javadocs 2019-03-18 17:17:34 -07:00
Byteflux
6a9800938d Apply delombok to sources, generate javadocs from delombok sources 2019-03-18 20:42:54 +00:00
kashike
aec375c836
fix critical formatting error 2019-03-17 14:29:47 -07:00
Shane Freeder
03ebf04b65 Add ProxyDefineCommandsEvent (Fixes #358)
provides an event to allow plugins to intercept tab completions
sent to the client
2019-03-16 07:08:11 +00:00
Shane Freeder
c31195b627 Updated Upstream (BungeeCord)
Fixes #356

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:
caeabb5b #2610: Fix out of date message for unsupported versions
2019-03-09 01:29:09 +00:00
Shane Freeder
504670360d Fix allowEmptyPackets setting to return real value (Fixes #357) 2019-03-06 15:35:52 +00:00
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