SteamWar/Velocity
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,134 Commits 2 Branches 0 Tags
d1a5d8dd82383867902a5e20d2364ed24f1902b1
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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 669bd14779 Remove duplicate in-flight connection reset 2020-06-03 12:18:29 -04:00
Andrew Steinborn 40ec39aa5e Merge pull request #316 from lucko/fix/cleanup-config 
Fix config formatting
 2020-06-02 20:03:48 -04:00
Andrew Steinborn e3084e21a7 Merge pull request #315 from lucko/feature/bungeeguard 
Implement legacy forwarding BungeeGuard handshake support
 2020-06-02 19:36:24 -04:00
Andrew Steinborn e83662e8c3 Clean up imports and remove some legacy declarations. 2020-05-29 21:36:58 -04:00
Andrew Steinborn b028d9ca8f Use standard Guava annotation 2020-05-28 10:44:42 -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 305949487e Add @UnstableApi annotation. Resolves #313 2020-05-28 07:05:19 -04:00
Andrew Steinborn eeb660ce00 Fix bad ordering 2020-05-26 05:25:03 -04:00
Andrew Steinborn d538516f4c Bump Netty version 2020-05-25 16:08:53 -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 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 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 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
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 5424c55f09 Merge pull request #301 from Leymooo/command-event 
fix build
 2020-04-30 01:13:30 -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
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
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 e6ea191c92 Bump Netty to 4.1.49.Final 
This is intended to fix netty/netty#10165 directly, and supersede our current workaround.
 2020-04-22 10:28:17 -04:00
Andrew Steinborn 187a625aa4 Bump Netty to 4.1.49.Final 
This is intended to fix netty/netty#10165 directly, and supersede our current workaround.
 2020-04-22 10:27:08 -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 24c9fc0ef1 Relax GameProfileRequestEvent#setGameProfile to allow faking even in online-mode 2020-04-19 09:20:03 -04:00
Andrew Steinborn d0cbcf65e9 Fix some tab-complete regressions 2020-04-19 09:07:17 -04:00
Andrew Steinborn 5c93fd3866 Merge pull request #294 from creeper123123321/backend-initializer 
(Implementation) Allow injecting into backend connection
 2020-04-14 01:43:24 -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
Andrew Steinborn 558c158592 Close one last "proxy crasher" loophole 2020-04-12 17:19:00 -04:00
Andrew Steinborn 49ab2764c4 Close one last "proxy crasher" loophole 2020-04-12 17:18:53 -04:00
Andrew Steinborn 5d3479aae5 Velocity 1.0.8-SNAPSHOT 2020-04-11 21:56:28 -04:00
Andrew Steinborn 3e24d7ea8d Velocity 1.0.7 2020-04-11 21:56:07 -04:00
Andrew Steinborn 2e38e0e1cb Properly fix the previous patch 2020-04-11 21:52:01 -04:00
Andrew Steinborn 6ad8381645 Velocity 1.0.7-SNAPSHOT 2020-04-11 21:30:25 -04:00
Andrew Steinborn 386e7e94c8 Velocity 1.0.6 2020-04-11 21:30:09 -04:00
Andrew Steinborn 8df4467392 Upon connection exception, discard all incoming packets instead 2020-04-11 21:24:39 -04:00
Andrew Steinborn 6ed61848e9 Upon connection exception, discard all incoming packets instead 2020-04-11 21:19:54 -04:00
Andrew Steinborn c0ef3edcc4 Merge pull request #274 from Crypnotic/bugfix/invalid-server-key 
Clean server name keys before attempting to register
 2020-04-08 16:45:02 -04:00
Andrew Steinborn bb74fe769e Merge pull request #279 from hugmanrique/cleanup-task 
Remove tasks from lookup map upon completion
 2020-04-07 21:17:03 -04:00
Andrew Steinborn 98b03376e5 Merge pull request #281 from Gabik21/tablist-improvement 
Don't send ping update twice (1.7)
 2020-04-07 13:35:18 -04:00
Andrew Steinborn 4374f1e4d6 Merge pull request #288 from Gabik21/fix-1.7-weirdness 
Fix tablist behaving wrong with colors (1.7) (Fixes #282)
 2020-04-07 11:51:21 -04:00
Andrew Steinborn ae7f0143de Do not trim the args for string-based command APIs 2020-02-28 16:54:46 -05:00
Andrew Steinborn 65acb13dca Checkstyle 2020-02-21 18:51:41 -05:00
Andrew Steinborn 3e053d63b4 Allow ping passthrough for descriptions too 2020-02-21 18:36:10 -05:00
Andrew Steinborn c63bd4cd02 Fix checkstyle error 2020-02-17 20:35:28 -05:00
Andrew Steinborn 8ae7945b9f Upon connection exception, discard all incoming packets instead 2020-02-17 19:34:22 -05:00
Andrew Steinborn 599adc6d2c Merge remote-tracking branch 'origin/dev/1.1.0' into dev/1.1.0 
# Conflicts:
#	proxy/src/test/java/com/velocitypowered/proxy/plugin/util/PluginDependencyUtilsTest.java
 2020-02-17 16:33:34 -05:00
Andrew Steinborn 37994449d7 Fix regressions with plugin dependency loading from #272 
This is a quick and dirty fix because it's late. I'll need to
commit a better fix later.
 2020-02-16 03:19:13 -05:00
Andrew Steinborn 3b6f8e2421 Use more obvious/broken-down test cases for topological sort tests 2020-02-16 00:29:35 -05:00
Andrew Steinborn 9444cfa70f Use more obvious/broken-down test cases for topological sort tests 2020-02-13 19:21:40 -05:00
Andrew Steinborn 5c6163d8cd Use more obvious/broken-down test cases for topological sort tests 2020-02-13 19:20:53 -05:00
Andrew Steinborn a5350c6822 Deal with potentially nullable player sample entries 2020-02-13 13:32:47 -05:00
Andrew Steinborn 7d1770d37e Deal with potentially nullable player sample entries 2020-02-13 13:32:22 -05:00
Andrew Steinborn 5b75927586 Bump to 1.0.6-SNAPSHOT for further development 2020-02-13 13:04:50 -05:00
Andrew Steinborn 11dfbd3b9e This is Velocity 1.0.5 2020-02-13 13:04:17 -05:00
Andrew Steinborn e558b7ca1f Update to new bStats revision 2020-02-13 12:58:24 -05:00
Andrew Steinborn 29168ae549 Update to new bStats revision 2020-02-13 12:57:48 -05:00
Andrew Steinborn 77526d9bf4 Merge pull request #266 from alex11441/dev/1.1.0 
Allow users to specify a reason in the shutdown command
 2020-01-24 16:01:23 -05:00
Andrew Steinborn 0c7a995767 Don't attempt to retain the buffer if it goes to a closed connection 2020-01-24 01:22:44 -05:00
Andrew Steinborn c7bac69290 Don't attempt to retain the buffer if it goes to a closed connection 2020-01-24 01:22:32 -05:00
Andrew Steinborn a1577dd8a5 Minecraft 1.15.2 2020-01-21 13:28:37 -05:00
Andrew Steinborn 6e41ce7f15 Minecraft 1.15.2 2020-01-21 13:28:27 -05:00
Andrew Steinborn fb0446f4fc Add DisconnectEvent#disconnectedDuringLogin() 2019-12-24 23:56:39 -05:00
Andrew Steinborn ad8c6677ed Begin 1.0.5-SNAPSHOT 2019-12-23 02:02:39 -05:00
Andrew Steinborn 78af6f7cdf Velocity 1.0.4 2019-12-23 01:59:15 -05:00
Andrew Steinborn 1e50615993 Minecraft 1.15.1 2019-12-17 13:58:44 -05:00
Andrew Steinborn 4c09024952 Minecraft 1.15.1 2019-12-17 13:57:23 -05:00
Andrew Steinborn c3068ea26b Rename mystery field in JoinGame 2019-12-14 17:45:54 -05:00
Andrew Steinborn fa489f6014 Rename mystery field in JoinGame 2019-12-14 17:45:10 -05:00
Andrew Steinborn b56302b17e Minecraft 1.15 (backport from 1.1.0) 2019-12-10 12:22:24 -05:00
Andrew Steinborn 07c2024307 Minecraft 1.15 2019-12-10 11:47:10 -05:00
Andrew Steinborn b5aeeab2a8 Minecraft 1.15-pre7 2019-12-09 18:00:08 -05:00
Andrew Steinborn 8c3f7e2ecc Optimize DNS resolution logic for AsyncHttpClient 2019-12-01 15:17:17 -05:00
Andrew Steinborn 75359256b3 Introduce velocity.natives-tmpdir property for properly handling noexec /tmp 2019-11-29 14:27:27 -05:00
Andrew Steinborn e06e2e4cf9 Introduce velocity.natives-tmpdir property for properly handling noexec /tmp 2019-11-29 14:26:59 -05:00
Andrew Steinborn d8dba8a96c Graceful fallback when /tmp is amounted noexec on Linux 
Fixes #260
 2019-11-29 12:04:46 -05:00
Andrew Steinborn 2f55912995 Graceful fallback when /tmp is amounted noexec on Linux 
Fixes #260
 2019-11-29 12:04:12 -05:00