Mirrors/Velocity
3
0
Fork 1
Mirror von https://github.com/PaperMC/Velocity.git synchronisiert 2024-12-27 08:30:18 +01:00
Code Issues Pakete Projekte Releases Wiki Aktivität
2.011 Commits 20 Branches 0 Tags 15 MiB
9b71564c5b
Commit graph

1332 Commits

Autor SHA1 Nachricht Datum
Seppe Volkaerts
821ca02ee7 Backport Velocity Polymer's async event API, with changes. 
This commit backports the event manager from Velocity Polymer, with some changes for Velocity 1.1.x API compatibility:

- All event handlers run asynchronously. (While EventTask.async() exists, it is not useful in 3.0.0, but is provided as a migration aid for Polymer.)
- Event ordering is currently limited to the 5 levels available in Velocity 1.x.x.
 2021-05-23 15:39:06 -04:00
Andrew Steinborn
3f50964f36 Fix CommandManager method naming so that it is in sync with the 1.1.0 API 2021-05-23 14:20:59 -04:00
Andrew Steinborn
977300cc66 Remove text 3.x API and associated deprecated APIs 2021-05-23 14:13:51 -04:00
Andrew Steinborn
569bb4a16b Just import the entire command manager from Polymer, without changing any names 2021-05-23 13:58:27 -04:00
Andrew Steinborn
590f18dbe0 Convert to Java 11 compressor 2021-05-23 13:58:01 -04:00
Andrew Steinborn
d6dcb115f1 Remove remaining deprecated APIs 2021-05-23 13:49:06 -04:00
Andrew Steinborn
6816c15385 Remove bad test 2021-05-23 13:47:20 -04:00
Andrew Steinborn
2f0ee15051 Remove deprecated Velocity 1.0.0 Command API. 2021-05-23 13:46:47 -04:00
FivePB
18466bb595
Snapshot 21w19a 2021-05-13 23:50:00 +02:00
FivePB
8def411b2b
Snapshot 21w15a 2021-05-13 23:49:55 +02:00
Five (Xer)
581303a54c
Snaphot 21w10a 2021-05-12 21:42:27 +02:00
Five (Xer)
6207647aae
Remove leftovers 2021-05-12 21:42:27 +02:00
Five (Xer)
22bc759044
Snapshot 21w08a 2021-05-12 21:42:27 +02:00
Five (Xer)
b19cf16345
Snapshot 21w07a 2021-05-12 21:42:27 +02:00
FivePB
f0d9a445ed
Snapshot 21w03a 2021-05-12 21:42:27 +02:00
Five (Xer)
040cc29c34
Snapshot 20w49a 2021-05-12 21:42:27 +02:00
Five (Xer)
d8a39fc438
Snapshot 20w46a 2021-05-12 21:42:27 +02:00
Five (Xer)
7f0964155c
Snapshot 20w45a 2021-05-12 21:42:27 +02:00
Andrew Steinborn
11ed4b46e4 whoops 2021-05-09 02:57:52 -04:00
Andrew Steinborn
5170da8fd7 Improve writeVarInt inlining by peeling the two most common cases 2021-05-09 02:57:01 -04:00
Andrew Steinborn
150fd9a9cf Add highly-optimized VarInt writing method 2021-05-08 23:26:43 -04:00
Andrew Steinborn
6369a95ec9 Readd safe and slow compression handling and hide it behind a system property 2021-05-08 18:40:23 -04:00
Leymooo
a8e0516d18 Also do not copy memory in case when packet needs to compress 2021-05-07 19:36:30 +03:00
Andrew Steinborn
37a4199d43 Combine VarInt prefix encoding with compression 
This saves us a memory copy in the common "there is no need to compress this packet" case.
 2021-05-06 19:56:45 -04:00
Andrew Steinborn
fb3f21abc6 More bitshifting magic 2021-05-06 00:48:19 -04:00
Andrew Steinborn
1cef82d54d Unroll the VarInt writing loop 
This is about as optimized as it can get. Thanks to @Leymooo for the idea, I simply expanded on it. We optimize for the common 1-3 byte cases, and punt more "complicated" cases to the original VarInt writing function we had before.
 2021-05-05 22:13:54 -04:00
Andrew Steinborn
d42cc4f984 Force a flush after a certain threshold of packets have been queued for sending 
Fixes #486.
 2021-05-04 18:51:01 -04:00
Nicolas RAYNAUD
e0153267db
Fixed copyright year (#490) 2021-05-04 18:22:50 -04:00
Andrew Steinborn
7c76ae9a27 Make sure to check not only the entire array but also how much was written 2021-05-04 16:32:37 -04:00
Andrew Steinborn
3dc8e25ec7 Fix varint writing (for real!) 
Thanks to @Leymooo for reporting and providing test cases. (I also added one of my own tests which proved the most useful to debugging the issue.)
 2021-05-04 16:30:32 -04:00
Riley Park
2713831f77 Revert "Avoid calling writeVarInt in the (very) common uncompressed packet case" 
This reverts commit c041bea1b6.
 2021-05-03 19:38:39 -07:00
Andrew Steinborn
c041bea1b6 Avoid calling writeVarInt in the (very) common uncompressed packet case 2021-05-03 20:17:51 -04:00
Andrew Steinborn
0debb81392 I was nagged to make it more consistent 2021-05-03 20:08:16 -04:00
Andrew Steinborn
0811ebb312 Gotta add the license header to the test file 2021-05-03 19:18:06 -04:00
Andrew Steinborn
4ca97a6df9 Reapply "Optimize varint writing" 
Inspired by the approach described at the bottom of https://richardstartin.github.io/posts/dont-use-protobuf-for-telemetry

Given that we do a lot of varint writing as well, this should provide a small performance boost for larger/complex packets whilst not regressing hard on smaller packets.

This includes a test to ensure that the behavior is as expected and fixes the initialization loop so that the correct results will be given. Much thanks to @octylFractal for acting as my duck while trying to figure this out.
 2021-05-03 19:14:48 -04:00
Andrew Steinborn
e531cdb373 Revert "Optimize varint writing" 
This reverts commit 3db2fe8d63.
 2021-05-03 18:07:25 -04:00
Andrew Steinborn
3db2fe8d63 Optimize varint writing 
Inspired by the approach described at the bottom of https://richardstartin.github.io/posts/dont-use-protobuf-for-telemetry

Given that we do a lot of varint writing as well, this should provide a small performance boost for larger/complex packets whilst not regressing hard on smaller packets.
 2021-05-03 17:31:32 -04:00
Andrew Steinborn
347853b945 Disable hinting test for now 2021-04-25 10:18:58 -04:00
Andrew Steinborn
81311e7516 Don't attempt to decode empty buffers (fixes #482) 
Stuff like this makes me want to drop support for <=1.13 versions of Minecraft.
 2021-04-25 10:14:13 -04:00
Andrew Steinborn
ce26ae76c2 Fix case-sensitivity for ping passthrough 2021-04-22 11:23:42 -04:00
Andrew Steinborn
ca52f8989e Load forced hosts as lowercase too, see #464 2021-04-18 08:22:36 -04:00
Andrew Steinborn
ff54622663 Forced hosts should be case-insensitive. Fixes #464 2021-04-18 08:20:04 -04:00
Andrew Steinborn
f1cb3eb1a2 Move timeout handler to after frame decoder 
Mitigates attacks like the one described in SpigotMC/BungeeCord#3066. This cannot be considered a full protection, only a mitigation that expects full packets. The attack described is essentially the infamous Slowloris attack.
 2021-04-15 22:56:37 -04:00
Andrew Steinborn
c51359e893 Move away from deprecated percent() method. 
Also fixed another small nit.
 2021-04-15 04:23:59 -04:00
Andrew Steinborn
4de71fe942 Fix color and overlay packets for Adventure boss bar 
Someone discovered this bug but decided not to tell anyone. For the record, I'm the one who was brain-damaged... well, I made that particular copy-paste error.
 2021-04-15 04:22:44 -04:00
Cubxity
5ea6728d1a
Added ListenerBoundEvent and ListenerCloseEvent. (#454) 2021-04-02 13:24:45 -04:00
Rocco
c34aee76ae
Fix Forge/Client Proxy Connections mismatch in config (#456) 2021-04-02 12:36:32 -04:00
A248
7ba2318506
Fix one more case of a possibly swallowed exception (#455) 
Maybe spotbugs will add a rule for this in the future
 2021-04-02 01:45:58 -04:00
Andrew Steinborn
c747120b20
Relicense the Velocity proxy under the terms of GPLv3 (#448) 2021-03-31 16:04:06 -04:00
Andrew Steinborn
514115a85c Do not use an ASCII string for handshake 2021-03-30 12:10:55 -04:00
Andrew Steinborn
f88283f127 Revert "Revert strict handshake hostname checks" 
This reverts commit 4f80d2b261.

Experience elsewhere (Waterfall PR) and confirmation from TCPShield means
this ought to work. Let's hope.
 2021-03-30 12:08:08 -04:00
Andrew Steinborn
8aad6e2ece clear input buffer in case of bad varints 2021-03-30 12:05:43 -04:00
Andrew Steinborn
0cc300b621 don't swap these two around 2021-03-23 07:38:07 -04:00
Andrew Steinborn
3111816545 Warn about null permission functions. 2021-03-23 07:32:01 -04:00
A248
0016f4ce19
Relay more exceptions (#446) 2021-03-22 08:11:25 -04:00
Andrew Steinborn
015693090f Fix typo (thanks zml) 2021-03-21 16:17:41 -04:00
Andrew Steinborn
da54a091fb Allow the java.lang module to be opened, as a temporary Java 15+ workaround 2021-03-21 16:16:19 -04:00
Andrew Steinborn
72d47b5a3d Don't advertise the BungeeCord plugin messaging channel if it is disabled. 2021-02-18 18:12:51 -05:00
David Mayr
648624d333
Check permissions before providing suggestions (#430) 2021-02-16 19:13:48 -05:00
Andrew Steinborn
1a768bda9d We're going to need custom hash maps after all. 2021-02-16 01:15:58 -05:00
Andrew Steinborn
b94303d2be Map command nodes being serialized by their identities 
Fixes #429
 2021-02-16 01:14:22 -05:00
Bastian
7a713e9379 Update bStats and migrate to new config file 
This commit simplifies the Metrics class by using the new base module
from bStats. It also migrates to the new bStats config file that will
be used by plugins that integrate bStats. If a user disabled bStats in
the old config file, this setting will be copied to the new config file.
 2021-02-12 20:29:07 +01:00
Camotoy
fb879cb498
Apply initial requested changes 2021-02-09 14:13:33 -05:00
Camotoy
d47b339908
Add PlayerPluginMessageRegisterEvent 2021-02-09 13:51:43 -05:00
Andrew Steinborn
7e42c5b2e7 Turn some APIs into no-ops if they apply to clients without the relevant client functionality. 2021-02-07 15:19:59 -05:00
Andrew Steinborn
b88c573eb1 Correctly forward the player's virtual host to the remote server. 2021-02-01 16:17:02 -05:00
Andrew Steinborn
4f80d2b261 Revert strict handshake hostname checks 
These will break TCPShield and Cosmic Guard plugins. Sad as this was a worthwhile mitigation.
 2021-01-29 23:08:14 -05:00
Andrew Steinborn
501853e807 Fix Checkstyle issue for the umpteenth time... 2021-01-29 17:59:00 -05:00
Andrew Steinborn
4f6d238b39 Strictly limit the hostname size and limit it to ASCII characters only 2021-01-29 17:56:50 -05:00
Andrew Steinborn
4219bf7b09 *Actually* fix Checkstyle issues 2021-01-26 20:02:07 -05:00
Andrew Steinborn
b982c5b6ed Fix Checkstyle issues 2021-01-26 19:59:29 -05:00
Andrew Steinborn
0c90e94e85 fix 2021-01-26 19:50:43 -05:00
Andrew Steinborn
5ceac16a82 Add upfront size checks for some packets. 
This is simply a further protection against certain attacks which send malformed packets to the proxy.
 2021-01-26 12:33:35 -05:00
Andrew Steinborn
959e75d16d Revert "Also provide a "proper" java.util.logger logger to plugins." 
This reverts commit 8d71ea7135.

Totally broken
 2021-01-25 09:46:42 -05:00
Andrew Steinborn
8d71ea7135 Also provide a "proper" java.util.logger logger to plugins. 2021-01-25 01:54:50 -05:00
Andrew Steinborn
4bc76b3012 Add JUL support to log4j 
Certain badly behaved plugins insist on logging with java.util.logging. Accommodate them.
 2021-01-25 01:51:32 -05:00
Andrew Steinborn
68ae92f977
Merge pull request #419 from 0-x-2-2/dev/1.1.0 
Use keepalive queue instead of just the last keepalive.
 2021-01-23 20:18:14 -05:00
0x22
7aed76ee3d
Use keepalive queue instead of just the last keepalive. 2021-01-23 18:35:14 -05:00
Andrew Steinborn
03e9fa79d6 Raise limit on JoinGame NBT reading to 2MiB. 
This is required for particularly large mod packs (think All of Fabric 3 for instance).
 2021-01-23 12:55:28 -05:00
Andrew Steinborn
fcffccf0d8 Fix typo 2021-01-23 01:35:49 -05:00
Andrew Steinborn
ce7d1dcb26 A new year, a new color for Velocity! 2021-01-23 01:34:46 -05:00
Andrew Steinborn
892ac6f626 Accept changes to compression treshold on the fly. 
Vanilla allows this for some reason, and there has been one case where Velocity's strict behavior has caused a bug. Fix this.
 2021-01-21 17:58:09 -05:00
Andrew Steinborn
567a3b2365 Swallow and more usefully log exceptions in scheduler task running. 2021-01-09 16:39:38 -05:00
Andrew Steinborn
ba1c1eef64 More clarification 2021-01-06 13:30:57 -05:00
Andrew Steinborn
4df8f70156 Rename proxy-protocol setting to haproxy-protocol to make it clearer this is for HAProxy. 2021-01-06 13:29:30 -05:00
Andrew Steinborn
1f9c24566d Fix off-by-one error in MinecraftCompressEncoder 2020-12-31 13:18:01 -05:00
Andrew Steinborn
dc7ab0f7f5 Log server backpressure 2020-12-27 18:36:54 -05:00
Andrew Steinborn
2a1e83902d Add support for server-side backpressure 2020-12-27 18:05:27 -05:00
Andrew Steinborn
7329d165f6 2021 2020-12-26 21:56:19 -05:00
Andrew Steinborn
6a8ec21f26 Use a different quiet exception type to indicate the user should enable a debugging flag if needed 2020-12-26 20:59:17 -05:00
Andrew Steinborn
f6078e9b74 Fix several problems and clean up the BungeeCord plugin messaging support. 
Fixes #402
 2020-12-26 20:52:12 -05:00
Andrew Steinborn
b1f7980c5d Fix ForwardToPlayer subchannel, closes #406 2020-12-26 19:49:28 -05:00
Andrew Steinborn
7fe2fc71e9 Add some small debug for refcount issues with plugin messages. 2020-12-25 17:03:38 -05:00
Andrew Steinborn
07b95d46ac Delay sending stats to bStats for 3-5 minutes after server startup 2020-12-21 20:14:57 -05:00
Andrew Steinborn
eb3868d911 Do not try to override colors in messages or server-sent messages 2020-12-21 19:56:17 -05:00
Andrew Steinborn
98b74fd220 Correctly retain message buffer for LoginPluginMessage. 
Fixes #407
 2020-12-21 13:14:38 -05:00
Andrew Steinborn
523b61e0c7 Make sure unit tests actually run(!) and fix command hints 2020-12-14 14:39:39 -05:00
Andrew Steinborn
4f5c315ef8 Remove netty-resolver-dns dependency 
Geyser has fixed the issue in the latest builds
 2020-12-14 04:29:28 -05:00
Andrew Steinborn
991aaa31b1 Revert "Stop bundling the Netty DNS resolver, we don't use it" 
This reverts commit 88a57b77df.

Breaks Geyser
 2020-12-13 18:47:47 -05:00
Jk C
5bd60a4b77
Fix spelling issues and grammer issue 2020-12-11 18:57:01 -07:00
Jk C
808205302e
Spelling issue 2020-12-11 16:57:13 -07:00
Andrew Steinborn
88a57b77df Stop bundling the Netty DNS resolver, we don't use it 2020-12-10 06:56:19 -05:00
Andrew Steinborn
aef0e4a825 Update Netty to 4.1.55.Final. 2020-12-09 22:25:06 -05:00
Andrew Steinborn
2a5bb1e487 Fix tab list clearing bug. 
Fixes regression introduced in 5da085d
 2020-12-07 02:28:03 -05:00
Riley Park
5da085d82f
Adventure 4.3.0: Player list header/footer 2020-12-06 17:50:57 -08:00
Andrew Steinborn
fa2655d49b Fix the debug message 2020-11-24 12:09:49 -05:00
Andrew Steinborn
aa7aee9dd7 Add another validation case although it's not strictly required 2020-11-24 12:05:27 -05:00
Andrew Steinborn
084b741375 Don't repeat validation in AvailableCommands 
When deserializing an AvailableCommands packet, we do a few sanity checks to ensure the packet is valid. Some of this work was repeated for each cycle (notably the root) so we now check the children and any redirects are defined only once.
 2020-11-24 12:03:34 -05:00
Andrew Steinborn
329e2b0dc9 Use our fork's removeChildByName 2020-11-16 13:09:47 -05:00
Andrew Steinborn
7ead4add67
Support custom mod argument tunneling (#390) 2020-11-16 02:58:00 -05:00
Andrew Steinborn
511165415d Switch to our internal Brigadier fork 2020-11-15 23:33:16 -05:00
Andrew Steinborn
44f872eea4 Better validate addresses in configuration. Fixes #385 2020-11-07 20:43:58 -05:00
A248
46da2553fb Permit passing PluginContainer to PluginManager#addToClasspath 2020-11-07 14:53:09 -05:00
Andrew Steinborn
d51f357fa8 Avoid unneeded copy in BackendPlaySessionHandler plugin messages 2020-11-07 10:57:03 -05:00
Andrew Steinborn
8a3b6403da Wrap plugin message copies in unreleasable copies. 
Trying to track down a very weird issue that barely makes sense to me.
 2020-11-07 09:40:09 -05:00
Andrew Steinborn
89e1a07448 Try and explicitly specify Java 8 in the modules. 2020-11-06 18:52:00 -05:00
Andrew Steinborn
fb888c3b8a Store players in VelocityRegisteredServer by UUID instead. 
Fixes an issue where players would be repeated in /glist and the like.
 2020-11-06 09:38:26 -05:00
Andrew Steinborn
cc89a2a1e5 We don't need to retain/release the mod list buffer in readModList 2020-11-05 20:04:31 -05:00
Gabik21
18f9368427
Fix ping response being delayed on 1.7 2020-11-05 12:32:35 +01:00
Andrew Steinborn
54c5effe27 Fix typos. 2020-11-03 16:06:30 -05:00
Andrew Steinborn
d708716ef6 Use slower server switching sequence for Legacy Forge clients 2020-11-03 15:58:03 -05:00
Andrew Steinborn
325ab19102 Move out VarintByteDecoder to improve escape analysis 2020-11-03 12:55:02 -05:00
Andrew Steinborn
9adba81d23 Use ByteBuf#clear() instead of skipping readable bytes 2020-11-02 22:44:53 -05:00
Andrew Steinborn
7944544606 Small cleanup in TransitionSessionHandler 2020-10-31 18:32:42 -04:00
Andrew Steinborn
4fb7e02326 Fix Checkstyle error 2020-10-30 06:35:35 -04:00
Andrew Steinborn
9a0affbca9 Fix disconnect issues in 1.7-specific logic. 2020-10-30 06:34:28 -04:00
Andrew Steinborn
cace7cc428 Fix typo resulting in BungeeCord plugin messaging not working 2020-10-28 20:44:50 -04:00
Andrew Steinborn
ba8d6fe42a Really Velocity 1.1.1. Fix a missed case of 7bec4b2f1. 2020-10-28 19:06:43 -04:00
Andrew Steinborn
7bec4b2f12 Don't let clients fake being the BungeeCord plugin message channel 2020-10-28 18:54:51 -04:00
Andrew Steinborn
36ff6f63ae Use the fallback description if the backend server description is null 
This is technically incorrect but it seems like this is the best we can do...
 2020-10-28 17:11:19 -04:00
Andrew Steinborn
4ccbb2cde2 Fix TabCompleteResponse not using Adventure to read tooltips. 2020-10-27 07:29:08 -04:00
Andrew Steinborn
9f424522ac Authors should be a JSON array 2020-10-26 21:00:08 -04:00
Andrew Steinborn
536049995d Fix SpotBugs complaint 2020-10-26 20:58:20 -04:00
Five (Xer)
01070f8fd2
Velocity Dump Cleanup 2020-10-27 01:43:09 +01:00
Five (Xer)
140eaaf5ab
Velocity Dump WIP Part 2 2020-10-27 01:40:32 +01:00
Five (Xer)
6331e1af3e
Velocity Dump WIP 2020-10-27 01:36:20 +01:00
A248
278930a008 Handle exceptions relating to CompletableFuture operations 
Solves #374
 2020-10-26 13:52:04 -04:00
Andrew Steinborn
8995b64dc6 Do not use the GAME_INFO chat type. 2020-10-22 03:02:09 -04:00
Andrew Steinborn
a6e708c98e Fix Adventure sendActionBar implementation and add proper action bar sending for 1.16.2 2020-10-20 14:26:08 -04:00
Andrew Steinborn
e20c37fcba Reintroduce two-packet respawn sequence for older clients 
Fixes #372
 2020-10-15 15:38:51 -04:00
Andrew Steinborn
6e00dbe2b7 Fix compile errors 2020-10-14 16:08:20 -04:00
Andrew Steinborn
cffc6d0a81 Fix Checkstyle error 2020-10-14 13:58:28 -04:00
Riley Park
60e917b4a1
Player has an identity 2020-10-13 22:36:51 -07:00
Andrew Steinborn
59d8bd4c78 Plugins need to be stored in a LinkedHashMap too. 2020-10-11 14:36:56 -04:00
Andrew Steinborn
7fea1c4cb2 Fix modern forwarding if a user connects over IPv6(?!?) 
You don't see this every day...
 2020-10-10 10:58:32 -04:00
Andrew Steinborn
f58b78e896 Fix typo that emitted full responses for basic ones and vice versa 2020-10-08 14:43:34 -04:00
Andrew Steinborn
5072e1085a Revert server list ping changes 
They are broken with ping passthrough.
 2020-10-06 11:05:36 -04:00
Andrew Steinborn
706fea8a3c Fix checkstyle error 2020-10-04 15:31:59 -04:00
Andrew Steinborn
3bf252cf45 Start optimizing server list ping. 2020-10-04 15:30:28 -04:00
Andrew Steinborn
cb74210cd8 Ensure synchronous shutdown if the user kills the process. 2020-10-02 00:23:08 -04:00
Riley Park
cc6546bea9
Update for Adventure changes 2020-09-28 05:36:35 -07:00
Andrew Steinborn
a0a0966f99 Minor code cleanup 2020-09-23 01:02:19 -04:00
Andrew Steinborn
b61321f4f7 Shorten name of DurationUtils#toTicks 2020-09-21 11:27:47 -04:00
derklaro
fae1ee8373
Track some dependency updates 
junit: 5.3.0-M1 -> 5.7.0
slf4j: 1.7.25 -> 1.7.30
netty: 4.1.51.Final -> 4.1.52.Final
guava: 25.1-jre -> 29.0-jre
checkerFramework: 2.7.0 -> 3.6.1
jline-terminal-jansi: 3.12.1 -> 3.16.0
fastutil: 8.2.3 -> 8.4.1
async-http-client: 2.10.4 -> 2.12.1
completable-futures: 0.3.2 -> 0.3.3
gradle-wrapper: 6.6 -> 6.6.1

BREAKING CHANGE: No breaking change
 2020-09-15 13:27:16 +02:00
Frank van der Heijden
2b6c271cc7
Add ability to check for command alias existence in api module 2020-09-13 19:11:40 +02:00
Andrew Steinborn
7650eedb7a Fix compile error due to yet another breaking change in Adventure 2020-09-10 10:58:00 -04:00
Andrew Steinborn
1dd900194d Share instances of the custom Gson type serializers 2020-09-03 16:04:21 -04:00
Andrew Steinborn
5d287306c2 Small code cleanups 2020-09-01 03:25:15 -04:00
Andrew Steinborn
5a26b4e03d Fix coding error that caused players to time out if moving to another server fails 
Thanks to @Gabik21 for noticing this bug.
 2020-08-30 20:58:15 -04:00
Andrew Steinborn
764c8ed3e5 Fix compile error 
While we're at it, change the newly-introduced shutdown API to use a generic Adventure component instead.
 2020-08-30 07:09:52 -04:00
Andrew Steinborn
fe0d31b0f0 Update comments in MinecraftCompressEncoder to be more accurate. 2020-08-29 19:11:23 -04:00
Andrew Steinborn
d28022ab60 Move connectedServer clearing check to be done later. 2020-08-27 15:24:48 -04:00
Andrew Steinborn
80687c9e1b Redundant word removed 2020-08-25 19:01:57 -04:00
Andrew Steinborn
7df1a9636e Explicitly warn against offline-mode 2020-08-25 19:01:06 -04:00
Andrew Steinborn
ba7cdac812 If a command is defined on the proxy, don't include suggestions from the backend too 2020-08-24 14:53:01 -04:00
Andrew Steinborn
10a14af2ea Include success message too 2020-08-24 14:13:46 -04:00
Andrew Steinborn
6cc173d337 Correctly handle disconnect if there is no opportunity to kick the player to another server. 2020-08-24 14:08:35 -04:00
Andrew Steinborn
01158b08a7 Implement BungeeCord IPOther message. Fixes #361 2020-08-24 10:40:50 -04:00
Andrew Steinborn
6b26daa281 Small cleanup in closeWith 2020-08-22 15:52:29 -04:00
Andrew Steinborn
005c12fb0f Fix build on Java 11 2020-08-22 13:57:13 -04:00
Andrew Steinborn
154b50992c Fix try list giving up after the first server. 2020-08-22 13:36:34 -04:00
Andrew Steinborn
1f621300f6 Revert #338 
This is creating more problems than it actually solves
 2020-08-22 02:40:35 -04:00
Andrew Steinborn
c47d25c88a Upgrade to Gradle 6.6 and use SpotBugs. 
As a result, at least one real bug was fixed! Nice.
 2020-08-21 19:09:04 -04:00
Andrew Steinborn
d8dba436d6 Fix starting the proxy without any config. Fixes #359 2020-08-21 12:42:15 -04:00
Andrew Steinborn
a6ddc137ee Reduce varint reading cost from max(1, 2n) to n+1 operations on ByteBuf 
The previous code, in an attempt to avoid exceptions, checked in.isReadable() each iteration of the loop. This isn't very efficient since it's possible for us to know the maximum size of the varint to read: it's the minimum of either the largest size a varint can be (5 bytes) or the size of the remaining readable bytes in the buffer.
 2020-08-21 01:05:04 -04:00
Andrew Steinborn
ade9deec47 Fix recent PR not loading default messages from config correctly. 2020-08-21 00:10:34 -04:00
Andrew Steinborn
c15a49ce7d
Merge pull request #356 from FrankHeijden/feature/messages 
Make hardcoded messages configurable
 2020-08-20 23:16:11 -04:00
Andrew Steinborn
1d4da8c32d Correctly implement status protocol specification according to vanilla. 2020-08-20 15:03:38 -04:00
Frank van der Heijden
e3fe538491
Create temp default config for getting defaults 2020-08-19 23:30:34 +02:00
Frank van der Heijden
62fac7db32
Merge branch 'dev/1.1.0' into feature/messages 2020-08-19 22:17:15 +02:00
Frank van der Heijden
4c5c641e5f
Fix adventure title times 2020-08-19 20:44:58 +02:00
Frank van der Heijden
3711d56e8c
Move VelocityMessages into config.toml 2020-08-19 20:42:22 +02:00
Frank van der Heijden
9e27dac557
Add configurable messages for disconnect and kick prefix 2020-08-18 23:52:13 +02:00
Andrew Steinborn
26f3cb43c7 Clean up some Adventure support code, implement another sendMessage overload 2020-08-16 14:02:04 -04:00
kashike
5623baf1e7 Use getBoolean/putBoolean, and fix using the wrong field for respawn_anchor_works 2020-08-16 04:13:10 -07:00
Andrew Steinborn
1717d7f9b4 Add SimpleCommand.Invocation#alias function. 
It seems like this ability is generally useful outside RawCommand, so let's add this to SimpleCommand too.
 2020-08-15 16:41:35 -04:00
Andrew Steinborn
7dffa7ce33 Fix tab complete for proxy commands for 1.12.2 and below and fix command tab complete repeating suggestions 2020-08-11 14:19:00 -04:00
Andrew Steinborn
c88a3807e7 Checkstyle strikes again! 2020-08-11 13:26:00 -04:00
Andrew Steinborn
d363d80a83 Use simplified form for new empty argument types 2020-08-11 13:25:02 -04:00
Andrew Steinborn
717f2a070d Remove any use of the word "dummy" 2020-08-11 13:24:11 -04:00
Andrew Steinborn
c0af5668b9
Merge pull request #338 from xxDark/read-timeout 
Make initial read timeout configurable
 2020-08-10 23:05:52 -04:00
Andrew Steinborn
24ca6156ac Add missing DimensionData field 2020-08-07 14:30:33 -04:00
Andrew Steinborn
9d36f9094d Fall back to wrapping the name in a component. Should fix #349 for real. 2020-08-07 07:19:22 -04:00
Andrew Steinborn
46e34ddb7f Allow serializing legacy hover events 
Should fix #349
 2020-08-06 20:53:19 -04:00
Andrew Steinborn
cab6919a46 Switch to adventure-nbt and fix server switching on 1.16.2-pre3 2020-08-06 17:38:52 -04:00
Andrew Steinborn
cb4555fa70 Merge branch 'dev/1.1.0' into future/1.16.2-velocity-1.1.0 2020-08-06 17:37:10 -04:00
Andrew Steinborn
5cceebdffc Read PlayerListItem display names according to the protocol version. 
Fixes #349
 2020-08-06 15:13:22 -04:00
Andrew Steinborn
b34b198064 1.16.2-pre3 2020-08-06 15:08:50 -04:00
Andrew Steinborn
6cec09974a Properly fix debug logging 2020-08-06 11:09:11 -04:00
Andrew Steinborn
b2d9e11217 Fix packet decode logging not giving useful errors 
See #349 for context
 2020-08-06 07:42:42 -04:00
Andrew Steinborn
d79c1d0407 Port of #325 for Velocity 1.1.0 
Co-authored-by: Five (Xer) <admin@xernium.com>
 2020-08-05 18:13:16 -04:00
Andrew Steinborn
3beaeb2df7
Merge pull request #341 from alexstaeding/feature/shutdown-api 
Add shutdown methods to ProxyServer
 2020-08-05 11:35:38 -04:00
Ivan Pekov
bb4bff7d34
Respect nodes' requirements (#350) 2020-08-05 11:33:03 -04:00
Jacob Allen
76173e4145
Add PRE_SERVER_JOIN to DisconnectEvent#LoginStatus (#346) 2020-08-04 16:30:17 -04:00
Andrew Steinborn
87bff1a123 Remove nextProtocolVersion from MinecraftConnection 
ViaVersion was the only intended user. However, ViaVersion for Velocity 1.1.0 no longer uses this functionality, and so it doesn't make sense to keep it in Velocity 1.1.0.
 2020-08-04 12:14:28 -04:00
Andrew Steinborn
e57c6d00c0 Move AutoReadHolderHandler after MinecraftDecoder. 2020-08-04 11:57:23 -04:00
Andrew Steinborn
2a04932112 Fix typo in register() where the primary alias would be unregistered if other aliases were specified. 2020-08-03 08:07:42 -04:00
xDark
a282afb5db Return earlier, predict list's size for tab clearing 2020-07-31 19:23:19 +03:00
Andrew Steinborn
933c81b9bf Fix legacy register command not allowing command overrides 2020-07-31 10:58:27 -04:00
Andrew Steinborn
5dcc0460a1
Merge pull request #340 from xxDark/channel-factory 
Use channel factories to create new channels
 2020-07-31 07:49:11 -04:00
xDark
76bef13377 Remove deprecated members 2020-07-31 14:17:31 +03:00
Andrew Steinborn
a6964bd31c Update for breaking Adventure boss bar changes 2020-07-30 20:16:20 -04:00
Alexander Staeding
190bef375a
Add shutdown methods to ProxyServer 2020-07-30 21:48:58 +02:00
xDark
6379936f32 Fix code style 2020-07-30 17:36:57 +03:00
xDark
d65507d4d5 Use channel factories to create new channels 2020-07-30 17:34:37 +03:00
Andrew Steinborn
e3a95b4783 Actually fix accidental breaking change not allowing aliases to be overridden. 2020-07-30 06:06:37 -04:00
Andrew Steinborn
7f1ee77a69 Fix accidential breaking change not allowing aliases to be overridden. 2020-07-30 06:03:29 -04:00
Andrew Steinborn
306221a92f Use default shutdown reason if the disconnect message is blank. 2020-07-30 06:01:38 -04:00
xDark
4958bb76e7 Add timeout property in default configuration 2020-07-29 17:30:24 +03:00
xDark
b79f6ad827 Make initial read timeout configurable 2020-07-29 16:59:39 +03:00
Andrew Steinborn
4c5636e6f7 Lie about command invocation succeeding if there is a syntax error. 
See https://github.com/VelocityPowered/Velocity/issues/337#issuecomment-665568793

This will need an API change to resolve, but it's late right now.
 2020-07-29 06:20:16 -04:00
Andrew Steinborn
b6a60b610a Resolve (most) issues flagged by @hugmanrique in 65e1b7be87 
This still needs to be configurable, but this is a first step towards shifting towards a more intuitive behavior.
 2020-07-29 05:51:40 -04:00
Andrew Steinborn
89f98ce57d Make Disposable interface implement Closeable 2020-07-29 05:34:15 -04:00
Andrew Steinborn
c2db8d4ac1 Swallow Throwable since plugins are naughty and don't do the right thing -_- 2020-07-29 03:58:04 -04:00
Andrew Steinborn
65e1b7be87 Hints will override the default catch-all by default 2020-07-29 03:55:59 -04:00
Andrew Steinborn
ae0bf6cfca Fix compile with JDK 8 2020-07-29 03:47:02 -04:00
Hugo Manrique
6cc6e0f641
New command API (#330) 2020-07-29 03:43:16 -04:00
Andrew Steinborn
5a515f37a3 Add missing allowed check. Fixes #335 2020-07-28 16:50:34 -04:00
Andrew Steinborn
7ab56d0ca0 Correctly populate the server address in the Forge case. Fixes #334 (correctly). 2020-07-27 17:24:04 -04:00
Andrew Steinborn
c377ed4b57 Preserve plugin load order correctly 2020-07-25 17:21:42 -04:00
Andrew Steinborn
2a29813bde Well, this is embarassing. 2020-07-24 21:15:07 -04:00
Andrew Steinborn
c3dcf9b1dd Strictly validate server ping state 2020-07-23 11:44:48 -04:00
Andrew Steinborn
f34b5ac2fc Yet another breaking change in the Adventure API 2020-07-22 11:18:46 -04:00
Andrew Steinborn
a55e690ad6 These aren't designed to be extended in any way. 2020-07-21 19:41:15 -04:00
Andrew Steinborn
250a35e53b Fix typo, thanks @hugmanrique for spotting this 2020-07-21 11:52:31 -04:00
Andrew Steinborn
e32acbaae7 Disable Netty resource leak detector by default. 2020-07-21 11:20:15 -04:00
Andrew Steinborn
c3e2321994 Update this with the true default. 2020-07-20 22:08:30 -04:00
Andrew Steinborn
ecec5e487a Add logging to command executions by players (#332) 2020-07-20 22:03:07 -04:00
Andrew Steinborn
cb261c6513 Better handle not failing over on a read timeout 
The existing Velocity logic was pretty optimistic, hoping the player connection would stay alive long enough to accept a connection to another server. Now, if we notice a read timeout on the server end, we'll treat the disconnect as "unsafe" and disconnect the player immediately.

I've added a configuration option to solve the issue in the way BungeeCord does it. This could cause issues with servers that extensively modify the server pipeline and could degrade the user experience, though. Let's try this more conservative and see if it helps,
 2020-07-20 21:55:33 -04:00
Andrew Steinborn
f9f60e1489 Small code cleanups and switch more stuff to adventure 2020-07-19 18:23:47 -04:00
Tim
da92d83b14 Make the logging of commands configurable 2020-07-19 21:49:12 +02:00
Tim
a9df92d308 Add logging to command executions by players 2020-07-19 19:46:10 +02:00
Andrew Steinborn
21ad6a433f Add MessageRaw support to BungeeCordMessageResponder 2020-07-16 15:18:11 -04:00
Andrew Steinborn
f6bdab8e53 Clean up unused import 2020-07-16 12:44:36 -04:00
Andrew Steinborn
4f19bfde3d Fix various problems with GS4QueryHandler 2020-07-16 12:44:02 -04:00
Andrew Steinborn
2296a9d8dd Fix compile error caused by adventure changes 2020-07-16 11:50:48 -04:00
Andrew Steinborn
72ce5c86ba Improve Velocity networking pipeline when under stress 2020-07-16 11:44:55 -04:00
Andrew Steinborn
f93e227491 Further improvements to pipeline in the worst-case scenario. 2020-07-15 18:26:48 -04:00
Andrew Steinborn
a8651f561d Update to event 4.0.0-SNAPSHOT for an optimized event path 2020-07-15 17:07:38 -04:00
Andrew Steinborn
98f1faf759 Work around ByteToMessageDecoder trying to be send more messages upstream when we wanted to discard them altogether 2020-07-15 16:52:48 -04:00
Andrew Steinborn
ce74dcc483 Try not to be crafty here 2020-07-15 16:33:42 -04:00
Andrew Steinborn
ff99b2b248 Convert all Velocity commands to use adventure text components 2020-07-14 21:31:32 -04:00
Mariell Hoversholm
9c8c851d12
Add async command suggestions 2020-07-15 00:28:22 +02:00
Andrew Steinborn
4c3d9de5fe Add ServerPostConnectEvent as a less confusing (and non-blocking) alternative to ServerConnectedEvent 2020-07-12 16:13:04 -04:00
Andrew Steinborn
f841d7590a Remove unused parameter 2020-07-12 11:57:07 -04:00
Andrew Steinborn
21bc050f9c Fix Checkstyle issues again 2020-07-12 11:56:50 -04:00
Andrew Steinborn
6e84261166 Merge branch 'dev/1.1.0' into adventure-api 2020-07-12 01:49:08 -04:00
Andrew Steinborn
86259f788f Adjust for recent adventure API changes. 2020-07-11 12:00:54 -04:00
Andrew Steinborn
85d88d59d3 Fix pinging being "delayed" on 1.7 2020-07-03 19:16:55 -04:00
Andrew Steinborn
079b352c97 Add a new loginstatus for CANCELLED_BY_USER_BEFORE_COMPLETE 2020-07-03 17:48:20 -04:00
Andrew Steinborn
4c1db86760 Merge branch 'make-disconnectevent-more-sane' into dev/1.1.0 2020-07-03 17:26:24 -04:00
Andrew Steinborn
209291e702 Improve the test a little 2020-07-01 00:36:12 -04:00
Andrew Steinborn
07da606abd Add OnceTest 2020-06-30 22:54:49 -04:00
Andrew Steinborn
47560442ca Remove SyncMap for now, use more obvious and correct MapMaker 2020-06-30 22:46:21 -04:00
Andrew Steinborn
1b8955a76b Add initial adventure boss bar support 2020-06-30 22:33:07 -04:00
Andrew Steinborn
5285a3c155 Remove AdventureCompact in favor of the text 3.x serializer added in KyoriPowered/adventure-platform#23 2020-06-29 23:34:59 -04:00
Luck
ea52cedfdf Fire ProxyShutdownEvent before closing the scheduler / event bus 
Fixes #322
 2020-06-29 11:18:52 -04:00
Andrew Steinborn
1938013ab2 Make DisconnectEvent more sane 
This is a step towards fixing #289 and removing some less-than-optimal behavior in plugins I maintain internally.
 2020-06-29 11:17:08 -04:00
Andrew Steinborn
70698246bf Get everything compiling and Checkstyle clean 2020-06-28 23:20:46 -04:00
Andrew Steinborn
c2edd82b16 Use more idiomatic adventure text serializer 2020-06-28 23:13:57 -04:00
Andrew Steinborn
0c6039a773 Make sure console is included in the ProxyServer audience 2020-06-28 22:57:28 -04:00
Andrew Steinborn
c4f143a2bc Implement adventure title APIs 2020-06-28 22:52:46 -04:00
Andrew Steinborn
5c02d6b007 RegisteredServer and ProxyServer now implement MultiAudience 2020-06-28 22:01:45 -04:00
Andrew Steinborn
70a989e955 Minor cleanup and add some missing Deprecated tags 2020-06-28 21:29:25 -04:00
Andrew Steinborn
2e7a598916 Initial commit of adventure-adapted Velocity API. 2020-06-28 21:23:01 -04:00
Andrew Steinborn
7fd76962f2 Graceful fallback if these values are absent 2020-06-27 23:03:47 -04:00
Andrew Steinborn
62703780e1 Fix a few areas of concern spotted by JITWatch 2020-06-27 21:33:05 -04:00
Andrew Steinborn
51819b563f Tolerate broken brand sending by some bots. 2020-06-24 22:32:44 -04:00
Andrew Steinborn
28d2366c73 Switch Velocity from existing toml4j+homebrew TOML serializer to night-config. 
This allows us to allow many more valid configurations and allows us to eliminate a bunch of ugly hacks.
 2020-06-24 21:31:39 -04:00
Andrew Steinborn
4bebda2549 Loosen Checkstyle rules for this. 2020-06-24 11:34:13 -04:00
Andrew Steinborn
7eaa6ef939 Fix saving of escaped strings 2020-06-24 11:21:34 -04:00
Andrew Steinborn
283d8d71b6 Restore compatibility with TCPShield plugin with recent change 2020-06-24 00:07:27 -04:00
Andrew Steinborn
780e1c8be5 Handle duplicates from server pings gracefully 2020-06-23 23:03:19 -04:00
Andrew Steinborn
fd231c71fd Restore server disconnect messages. 2020-06-23 21:57:16 -04:00
Andrew Steinborn
24cd1f4da0 Allow showing ping requests in the console. 
The default is false, but this can be enabled in the configuration if desired.
 2020-06-23 17:05:01 -04:00
Andrew Steinborn
1fe01596d2 Fix escaping issues with spaces in server names 
Fixes #320
 2020-06-23 16:07:25 -04:00
Andrew Steinborn
f7f4620b53 Temporarily revert DisconnectEvent changes due to some issues 2020-06-23 14:48:01 -04:00
Andrew Steinborn
ae6afc8b18 Fix Minecraft 1.7 support (bad merge) 2020-06-23 13:17:36 -04:00
Andrew Steinborn
0684e08f67 Really suppress the initial connection stuff 2020-06-23 08:32:47 -04:00
Andrew Steinborn
e9cc390abd Revert "Clean up ClientPlaySessionHandler#handle(PluginMessage)" 
This reverts commit ac4359ad21.

Suspected to be causing problems with Fabric and Forge
 2020-06-23 08:22:09 -04:00
Andrew Steinborn
df82c0b566 Suppress some really annoying spam 2020-06-23 07:56:19 -04:00
Andrew Steinborn
91743aaa9d Merge branch 'dev/1.1.0' into future/1.16-velocity-1.1.0 
# Conflicts:
#	proxy/build.gradle
 2020-06-21 13:40:19 -04:00
Andrew Steinborn
ab9115178b Merge branch 'decode-multiple' into dev/1.1.0 2020-06-21 13:39:24 -04:00
Andrew Steinborn
d1a5d8dd82 Fix compile on JDK 8 and bad merge 2020-06-21 13:38:05 -04:00
Andrew Steinborn
09f71dede9 Rebase #310 on Velocity 1.1.0 
Totally untested, proceed with caution.
 2020-06-20 23:26:24 -04:00
Andrew Steinborn
ada35ff286 Merge branch 'Xernium-future/1.16' into future/1.16-velocity-1.1.0 
# Conflicts:
#	.travis.yml
#	api/src/main/java/com/velocitypowered/api/network/ProtocolVersion.java
#	build.gradle
#	proxy/build.gradle
#	proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java
#	proxy/src/main/java/com/velocitypowered/proxy/connection/backend/VelocityServerConnection.java
#	proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java
#	proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
#	proxy/src/main/java/com/velocitypowered/proxy/network/netty/DiscardHandler.java
#	proxy/src/main/java/com/velocitypowered/proxy/protocol/ProtocolUtils.java
#	proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java
#	proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftCompressDecoder.java
#	proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftDecoder.java
#	proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/JoinGame.java
#	proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/Respawn.java
#	proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/ServerLoginSuccess.java
#	proxy/src/test/java/com/velocitypowered/proxy/plugin/util/PluginDependencyUtilsTest.java
 2020-06-20 23:24:32 -04:00
Andrew Steinborn
cd9bb61f20 Merge branch 'future/1.16' of https://github.com/Xernium/Velocity into Xernium-future/1.16 2020-06-20 23:11:19 -04:00
Andrew Steinborn
d6b1bc26d8 Read target of Forward message properly. Fixes #318 2020-06-19 05:36:52 -04:00
Andrew Steinborn
d1cbc7028a Merge branch 'dev/1.1.0' into decode-multiple 2020-06-19 05:23:20 -04:00
Andrew Steinborn
f8e20ab3a7 Fix tab complete using proper vanilla limit. 2020-06-19 05:22:35 -04:00