SteamWar/Velocity
13
0
Fork 0
geforkt von Mirrors/Velocity
Code Issues Pull-Requests Aktivität
1.264 Commits 1 Branch 0 Tags 13 MiB
2296a9d8dd
Commit graph

837 Commits

Autor SHA1 Nachricht Datum
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
Andrew Steinborn
b79d2d4a94 Fix tab complete using proper vanilla limit. 2020-06-19 05:22:19 -04:00
Five (Xer)
a1ab29186b
Changes 1.16-pre6 2020-06-16 17:56:56 +02:00
Andrew Steinborn
0109f4477a Complete the teardown future anyway 2020-06-12 07:27:51 -04:00
Andrew Steinborn
8a6e77689b Checkstyle strikes again 2020-06-12 07:26:25 -04:00
Andrew Steinborn
8b8fd284b3 Call DisconnectEvent explicitly instead of relying on ConnectedPlayer#teardown() to do it for us 
Should fix (but not verified) #289
 2020-06-12 07:24:17 -04:00
Andrew Steinborn
ac4359ad21 Clean up ClientPlaySessionHandler#handle(PluginMessage) 2020-06-12 07:16:43 -04:00
Andrew Steinborn
f4bc2ac131 Regenerate with random secret if not present in velocity.toml. 2020-06-12 03:10:25 -04:00
Five (Xer)
78b442a852
Changes 1.16-pre4 and Logic fixes 2020-06-11 23:39:16 +02:00
Andrew Steinborn
9bece076f5 Remove old Checker Framework relics. 
Proper Checker Framework support needs to wait for a major Velocity version and almost necessities a total refactor, if not rewrite, of Velocity.
 2020-06-11 02:08:04 -04:00
Andrew Steinborn
cf5f7fa38f Fix a typo. 2020-06-11 01:56:41 -04:00
Andrew Steinborn
6e7c0298de Remove Netty async DNS resolver completely 
It "mostly works" - but it's not good enough. Instead, we'll offload
the DNS resolution outside the event loop. This is a middle-ground approach between doing the resolution on the calling method (and potentially a Netty I/O thread) and using the intermittently broken Netty async DNS resolver.
 2020-06-11 01:54:12 -04:00
Five (Xer)
101a6a58dd
Changes 1.16-pre3 2020-06-10 21:00:18 +02:00
Five (Xer)
4e5f708bed
Resolve review 2020-06-07 00:51:21 +02:00
Five (Xer)
3ed5e7718c
Fix logic error 2020-06-07 00:33:06 +02:00
Five (Xer)
ef5b9cf183
Sync to IDE 2020-06-07 00:22:11 +02:00
Five (Xer)
f868cea583
Move to proper API 2020-06-07 00:14:23 +02:00
Lechner Markus
0377a6829f Move to Registry 2020-06-05 16:00:51 +02:00
Lechner Markus
6368b47e78 Old sins 2020-06-05 15:58:34 +02:00
Lechner Markus
aa4a8de2fd Stylize 2020-06-05 15:45:11 +02:00
Lechner Markus
368d50b455 Rework Dimension Registry 2020-06-05 15:22:55 +02:00
Five (Xer)
009f207883
More progress 2020-06-04 21:21:54 +02:00
Andrew Steinborn
bb69481f99 Lay down foundation for cross-architecture natives 
We have dropped the rarely used kqueue and replaced it with the new Netty aarch64
native. In addition, lay down the foundation for other aarch64 natives.
 2020-06-04 14:59:22 -04:00
Five (Xer)
6734ef3a08
Checkstyle-auto 2020-06-04 19:13:10 +02:00
Lechner Markus
18e5953976 Save progress 2020-06-04 15:36:58 +02:00
Andrew Steinborn
456b4b217f Run closeWith() logic in the event loop 2020-06-04 01:35:32 -04:00
Andrew Steinborn
ee4bae60a9 Merge branch 'dev/1.1.0' into decode-multiple 2020-06-03 12:18:43 -04:00
Andrew Steinborn
669bd14779 Remove duplicate in-flight connection reset 2020-06-03 12:18:29 -04:00
Andrew Steinborn
042a9df4f1 Merge branch 'dev/1.1.0' into decode-multiple 2020-06-03 12:13:34 -04:00
Luck
4263c4e2d4
Fix config formatting 2020-06-03 00:58:26 +01:00
Luck
c563372ffd
Remove unnecessary imports 2020-06-03 00:35:04 +01:00
Luck
2cd9f081c3
Merge branch 'dev/1.1.0' into feature/bungeeguard 2020-06-03 00:32:27 +01:00
Luck
70abda9c5b
Implement legacy forwarding BungeeGuard handshake support 2020-06-02 23:48:42 +01:00
Andrew Steinborn
46e92a069b Fix an issue with too short not breaking the loop 2020-05-31 14:01:27 -04:00
Andrew Steinborn
f27aa8e3ba Handle empty packets too 2020-05-31 09:54:47 -04:00
Andrew Steinborn
c856635ac5 Try two, with improved state maintenance and some bugs fixed 2020-05-31 08:14:33 -04:00
Andrew Steinborn
3a8ba76f25 This did not work :( 2020-05-31 07:55:19 -04:00
Andrew Steinborn
869f2a6b32 Merge branch 'dev/1.1.0' into decode-multiple 2020-05-29 21:37:10 -04:00
Andrew Steinborn
e83662e8c3 Clean up imports and remove some legacy declarations. 2020-05-29 21:36:58 -04:00
Andrew Steinborn
11fb5f2be3 Simplify the discard logic. 2020-05-29 21:35:07 -04:00
Andrew Steinborn
dd2e1ad241 Handle partially sent varints better 2020-05-29 21:11:21 -04:00
Andrew Steinborn
b6f1dcc166 Optimize varint frame decoding again 
Use ByteProcessor in a controlled matter in one specific case. Performance measurements with my Ryzen 5 3600 indicate a 25-35% improvement in time spent framing incoming packets.
 2020-05-29 20:52:04 -04:00
Andrew Steinborn
9f6d8e1840 Merge branch 'dev/1.1.0' into decode-multiple 2020-05-29 19:03:03 -04:00
Andrew Steinborn
cb99b184ed Allow plugins to mutate available commands sent to the client. 
This is the first unstable API being introduced and is primarily to get feedback on the system.
 2020-05-28 07:14:49 -04:00
Andrew Steinborn
d66766a38b Merge branch 'dev/1.1.0' into decode-multiple 2020-05-26 05:25:11 -04:00
Andrew Steinborn
eeb660ce00 Fix bad ordering 2020-05-26 05:25:03 -04:00
Andrew Steinborn
0d1acdb056 Merge branch 'dev/1.1.0' into decode-multiple 2020-05-25 16:09:19 -04:00
Andrew Steinborn
ebad3d1005 Use Integer.MIN_VALUE for the sentinel for readVarIntSafely() 2020-05-25 16:05:36 -04:00
Andrew Steinborn
d7bbe7531a Additional protocol hardening. 2020-05-25 15:58:52 -04:00
Andrew Steinborn
62d3f61a77 Merge branch 'dev/1.1.0' into decode-multiple 
# Conflicts:
#	proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
 2020-05-25 13:27:44 -04:00
Andrew Steinborn
abd81a0216 Fix Checkstyle errors. 2020-05-25 13:24:41 -04:00
Andrew Steinborn
0cb4c02107 Run all commands on a separate thread pool. 2020-05-25 13:09:04 -04:00
Andrew Steinborn
ec1fc3944d Make sure this runs on the event loop. 2020-05-25 12:08:24 -04:00
Andrew Steinborn
942e2f2e1a Better generic cleanup. 2020-05-25 11:56:56 -04:00
Andrew Steinborn
74ff56cbc9 Also reset when an exception is thrown. 2020-05-25 11:49:45 -04:00
Andrew Steinborn
64c16e61d2 Reset in-flight connection only if the server disconnects the client. 2020-05-25 11:44:02 -04:00
Andrew Steinborn
b0f1398b45 Further confinement of preconnect checks to event loop. 2020-05-25 10:26:05 -04:00
Andrew Steinborn
fa954ab717 Confine preconnect validation/setup logic to event loop. 2020-05-25 09:38:41 -04:00
Andrew Steinborn
75ddeb062f Confine preconnect validation/setup logic to event loop. 2020-05-25 09:38:22 -04:00
Andrew Steinborn
a98a7dd67e Merge branch 'dev/1.1.0' into decode-multiple 2020-05-24 11:41:17 -04:00
Andrew Steinborn
b3bd773fea Switch out Cloudflare zlib for libdeflate. 
libdeflate is significantly faster than vanilla zlib, zlib-ng, and Cloudflare zlib. It is also MIT-licensed (so no licensing concerns). In addition, it simplifies a lot of the native code (something that's been tricky to get right).

While we're at it, I have also taken the time to fine-time compression in Velocity in general. Thanks to this work, native compression only requires one JNI call, an improvement from the more than 2 (sometimes up to 5) that were possible before. This optimization also extends to the existing Java compressors, though they require potentially two JNI calls.
 2020-05-24 10:56:26 -04:00
Five (Xer)
38487c5bba
Server-change mechanics update 2020-05-23 13:03:33 +02:00
Five (Xer)
197bc4f288
Make checkstyle happy again 2020-05-23 11:49:27 +02:00
Five (Xer)
fca73bae67
Some minor touch-ups 2020-05-23 11:46:27 +02:00
Five (Xer)
d37b6a361c
Snapshot 20w21a 2020-05-23 00:18:36 +02:00
Andrew Steinborn
91e9769c5a Cap /server list to 50 servers. 
Any more, and the server list is arguably useless. Thanks to BXBW for finding this particular issue!
 2020-05-17 00:24:00 -04:00
Andrew Steinborn
feb7c2f893 Reject invalid tab complete command requests. 2020-05-08 18:22:21 -04:00
Andrew Steinborn
b42045c050 Reject invalid tab complete command requests. 2020-05-08 18:17:02 -04:00
Andrew Steinborn
10680f16d3 Reject invalid tab complete command requests. 2020-05-08 18:16:40 -04:00
Andrew Steinborn
2418cc271a
Merge pull request #307 from mikroskeem/feature/prevent-proxy-connections 
Add prevent-proxy-connections option
 2020-05-08 14:57:20 -04:00
Mark Vainomaa
21f03d5d50
Add prevent-proxy-connections option to make sending client IP to Mojang toggleable 2020-05-08 21:16:12 +03:00
Andrew Steinborn
4d62d61485 We're well into 2020, just saying. 2020-05-08 14:04:07 -04:00
Andrew Steinborn
f7e70cff20 We're well into 2020, just saying. 2020-05-08 14:03:57 -04:00
Andrew Steinborn
3bc8323ed5 We're well into 2020, just saying. 2020-05-08 14:03:35 -04:00
Andrew Steinborn
42ad7594ae
Merge pull request #300 from Leymooo/command-event 
fix command forwarding to server
 2020-04-29 15:26:29 -04:00
Leymooo
aa55af8eb7 fix command forwarding 2020-04-29 22:13:16 +03:00
Andrew Steinborn
e759668f53
Merge pull request #299 from Leymooo/command-event 
Add event for commands
 2020-04-29 12:51:47 -04:00
Andrew Steinborn
37a1a49fda Allow disabling BungeeCord plugin message channel. 2020-04-28 14:10:54 -04:00
Leymooo
26bf94f08f fix typos, update javadocs 2020-04-27 13:09:04 +03:00
Leymooo
c0b8e9d646 add async methods, also add separate methods which will call event and which will not call event 2020-04-27 01:05:57 +03:00
Leymooo
fb64333813 pass eventLoop to thenApplyAsync 2020-04-27 00:11:49 +03:00
Leymooo
1fb382e0f6 fix logic 2020-04-27 00:09:25 +03:00
Leymooo
6555e0e337 Add CommandExecuteEvent 2020-04-27 00:04:12 +03:00
Andrew Steinborn
1441dec367 Implement brigadier:long argument type, fixes #295 2020-04-23 16:21:44 -04:00
Andrew Steinborn
957c0dd307 Implement brigadier:long argument type, fixes #295 2020-04-23 16:21:22 -04:00
Andrew Steinborn
88641662d8 Implement brigadier:long argument type, fixes #295 2020-04-23 16:19:49 -04:00
Andrew Steinborn
bb129a3d0b Fix rare race condition with transitioning 
If the player unexpectedly disconnects after ServerConnectEvent is
fired, but before the connection transitions to the new player, Velocity
would throw an exception thinking the connection was not present. This
is the correct behavior, but the behavior is very surprising. Instead we
will double-check to ensure the connection has not been lost before we
continue with transitioning to the new server.
 2020-04-22 10:31:13 -04:00
Andrew Steinborn
81a0cbe3b9 Fix rare race condition with transitioning 
If the player unexpectedly disconnects after ServerConnectEvent is
fired, but before the connection transitions to the new player, Velocity
would throw an exception thinking the connection was not present. This
is the correct behavior, but the behavior is very surprising. Instead we
will double-check to ensure the connection has not been lost before we
continue with transitioning to the new server.
 2020-04-22 10:31:05 -04:00
Andrew Steinborn
2b84d35798 Fix bug in ConnectOther message 
Credits to @Jay113355 for spotting this
 2020-04-21 06:23:04 -04:00
Andrew Steinborn
d0cbcf65e9 Fix some tab-complete regressions 2020-04-19 09:07:17 -04:00
Andrew Steinborn
413578f979 Fix rare race condition with transitioning 
If the player unexpectedly disconnects after ServerConnectEvent is
fired, but before the connection transitions to the new player, Velocity
would throw an exception thinking the connection was not present. This
is the correct behavior, but the behavior is very surprising. Instead we
will double-check to ensure the connection has not been lost before we
continue with transitioning to the new server.
 2020-04-19 03:39:15 -04:00
creeper123123321
9f6d7c2e82 fix name 2020-04-13 11:57:12 -03:00
creeper123123321
e93a510b0f (Implementation) Allow injecting into backend connection 2020-04-13 10:35:26 -03:00
Andrew Steinborn
aae151e3d9 No need to register multiple times 2020-04-12 17:21:00 -04:00
Andrew Steinborn
4ddc55a5b7 No need to register multiple times 2020-04-12 17:20:54 -04:00
Andrew Steinborn
4494033fbe No need to register multiple times 2020-04-12 17:20:38 -04:00