Mirrors/Velocity
3
0
Fork 1
Mirror von https://github.com/PaperMC/Velocity.git synchronisiert 2024-11-17 21:40:27 +01:00
Code Issues Pakete Projekte Releases Wiki Aktivität
1.731 Commits 20 Branches 0 Tags 20 MiB
9efda3d42d
Commit graph

1149 Commits

Autor SHA1 Nachricht Datum
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
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
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
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
f49d36b719 Close one last "proxy crasher" loophole 2020-04-12 17:05:36 -04:00
Andrew Steinborn
b04b43954f Merge branch 'dev/1.1.0' into decode-multiple 2020-04-11 22:05:43 -04:00
Andrew Steinborn
2e38e0e1cb Properly fix the previous patch 2020-04-11 21:52:01 -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
Hugo Manrique
2c2eca3548 Only finish non-repeating tasks 2020-04-11 21:09:15 -04:00
Hugo Manrique
55818ce5eb Remove tasks from lookup map upon completion 2020-04-11 21:09:02 -04:00
Crypnotic
d4e51e2d07 Add cleanServerName to VelocityConfiguration to remove quotes and other unforeseen characters from server names before registration 2020-04-11 21:08:47 -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
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
Gabik21
2217e8a5c9
Fix 1.7 tablist behaving weird with colored names 
The 1.7 tablist packet only contains three types of information:

 - Name of the tablist entry (limited to 16 characters including colors)
 - Ping of the entry
 - If this entry needs to be added or removed (client accepts duplicates
 as 'ping update')

The previous logic was trying to preserve parity with
GameProfile#getName returning a stripped down name to have a 'real'
username.
That is fundamentally broken, because entries with duplicate content,
but different colors are very common, especially with custom tablists.

For packets coming from a native 1.7 server we just won't define the
displayname anymore, as there is no such thing as a 'displayname',
because tablist entries are not bound to any player.

Using the Velocity Tablist API to modify existing entries will work, though
the backend server will completely loose control over the entry. Custom
entries added over the Velocity Tablist API will work, but are cut off
by the 16 character limitation.

This commit only fixes the bug, where entries are incorrectly handled
with their stripped name, a lot of the things explained above were
already implemented correctly.
 2020-04-07 12:17:02 +02:00
Gabik21
5089da07fc
Don't send ping update twice 
VelocityTabListEntry#setLatency calls the update method, which
constructs a new packet and sends it to the client.
The backend packet we are processing also reaches the client, therefore
we are sending the same packet twice.
VelocityTabListEntry#setLatencyInternal is the correct method here.
 2020-04-02 17:46:24 +02:00
Hugo Manrique
d722422947
Only finish non-repeating tasks 2020-03-13 18:52:15 +01:00
Hugo Manrique
6ec6beedbd
Remove tasks from lookup map upon completion 2020-03-13 18:17:06 +01:00
Andrew Steinborn
ae7f0143de Do not trim the args for string-based command APIs 2020-02-28 16:54:46 -05:00
Andrew Steinborn
29bedf0943 Do not trim the args for string-based command APIs 2020-02-28 16:54:25 -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
932f3bc2bf Merge branch 'dev/1.1.0' into decode-multiple 2020-02-17 20:52:19 -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
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
5c6163d8cd Use more obvious/broken-down test cases for topological sort tests 2020-02-13 19:20:53 -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
Crypnotic
8fba9d7438 Add cleanServerName to VelocityConfiguration to remove quotes and other unforeseen characters from server names before registration 2020-02-09 13:40:15 -06:00
alexstaeding
da8cee2260
Make PluginContainer injectable (#272) 2020-02-07 16:22:47 -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
53c951bc52 Revert "Another experiment for memory leaks: Create a brand-new buffer for passthrough uncompressed content" 
This reverts commit 92571a65db.

It looks like c3fab89bd7 nabbed it at last.
 2020-01-24 01:21:50 -05:00
Andrew Steinborn
c3fab89bd7 Don't attempt to retain the buffer if it goes to a closed connection 2020-01-20 17:37:21 -05:00
Andrew Steinborn
92571a65db Another experiment for memory leaks: Create a brand-new buffer for passthrough uncompressed content 2020-01-14 22:18:05 -05:00
Andrew Steinborn
c14ceb315d Return the magic-3 loop again... :( 2020-01-01 10:14:15 -05:00
Andrew Steinborn
a15c8ecc2b Merge branch 'dev/1.1.0' into decode-multiple 2019-12-31 21:43:11 -05:00
Andrew Steinborn
08df080771 Try to diagnose memory leak 2019-12-31 21:43:02 -05:00
Alex
9f340347b6 Allow users to specify a reason in the shutdown command 2019-12-30 23:20:55 -07:00
Alex
941800ce96 Add VelocityServer#shutdown(boolean, TextComponent) 2019-12-30 23:20:25 -07:00
Andrew Steinborn
fb0446f4fc Add DisconnectEvent#disconnectedDuringLogin() 2019-12-24 23:56:39 -05:00
Andrew Steinborn
deede70070 Rename mystery field in JoinGame 2019-12-17 13:57:48 -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
97da6753b5 Merge branch 'dev/1.1.0' into decode-multiple 2019-12-06 03:10:25 -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
667610c251 Fix command block tab complete on <=1.12.2 2019-11-28 15:28:02 -05:00
Andrew Steinborn
d137d6ce46 Fix command block tab complete on <=1.12.2 2019-11-28 15:22:26 -05:00
Andrew Steinborn
d1acd5b6d5 Merge branch 'dev/1.1.0' into decode-multiple 2019-11-28 13:23:46 -05:00
Andrew Steinborn
50b50f3cbb Fix 1.13+ tab complete for server commands 2019-11-28 13:12:53 -05:00
Andrew Steinborn
ae82bb21af Merge branch 'dev/1.1.0' into decode-multiple 2019-11-27 01:09:21 -05:00
Andrew Steinborn
68e5372b2e QuietException should be a RuntimeException 2019-11-27 01:04:48 -05:00
Andrew Steinborn
467fe34da3 Provide useful information for "unexpectedly disconnected from server" 
Fixes #233
 2019-11-27 01:01:50 -05:00
Andrew Steinborn
0c14eabe6b Fix Checkstyle issues 2019-11-26 16:32:50 -05:00
Andrew Steinborn
87ad188f92 Finalize integrated BungeeQuack 2019-11-26 16:27:30 -05:00
Andrew Steinborn
b08f27b5c4 Merge branch 'dev/1.1.0' into bungeequack-integrate 2019-11-26 15:52:53 -05:00
Andrew Steinborn
0b6fc06e67 Initial 1.15-pre2 support 2019-11-26 15:10:22 -05:00
Andrew Steinborn
bfeca40b17 Make sure we only tab-complete commands for which we have access to 2019-11-26 14:08:16 -05:00
Andrew Steinborn
2baa162d91 Make sure we only tab-complete commands for which we have access to 2019-11-26 14:07:55 -05:00
Andrew Steinborn
893391202b Manually backport e29e20b from Velocity 1.1.0 2019-11-26 13:47:58 -05:00
Andrew Steinborn
e29e20b1e8 Fix 1.13+ tab-complete with command but no arguments 
As a nice side-effect, this simplifies the tab complete code
a bit.
 2019-11-26 13:44:21 -05:00
Andrew Steinborn
ae14eb8ccb Fix potential UDP speculative reflection attack 2019-11-23 01:07:29 -05:00
Andrew Steinborn
da63406ee7 Fix potential UDP speculative reflection attack 2019-11-23 01:06:00 -05:00
Andrew Steinborn
8725178d6d Flush queued packets to the client in case we can't write 2019-11-17 14:52:12 -05:00
Andrew Steinborn
3eeea8e8f8 Add limited flush consolidation, if the remote server supports it. 2019-11-17 11:14:56 -05:00
Andrew Steinborn
d2b8271eb4 Allow running Velocity without any servers. 
This is a niche setup, however if your network is 100% dynamically configured, this is a handy feature to have available.

To support this functionality, a new PlayerChooseInitialServerEvent event was added to allow the initial server to connect to be changed as desired.
 2019-11-16 23:17:09 -05:00
Andrew Steinborn
e12f970684 Fix fresh 1.1.0 velocity.toml generation. 2019-11-16 22:34:30 -05:00
Andrew Steinborn
010a10f50f Do not try to prevent people from running Velocity behind Velocity. 
This commit absolutely does not change our support policy on this: this
is a completely unsupported setup. In any event, there is an existing
forwarding check in Velocity that covers this case quite well.

I am making this change to make the login process less "chatty" for
higher-latency links and 1.13+ servers.
 2019-11-15 01:35:44 -05:00
Andrew Steinborn
ba8629ca0e Try to decode multiple packets at once 2019-11-15 00:39:11 -05:00
Andrew Steinborn
d333eb30b8 Always create the length buffer using the best possible native buffer 2019-11-09 22:07:54 -05:00
Andrew Steinborn
8c98f5a4a6 Simplify and harden Netty handlers 2019-11-05 20:07:47 -05:00
Andrew Steinborn
09d33de03e
Merge pull request #256 from Gabik21/previous-server-in-event 
Add previous server to ServerConnectedEvent
 2019-10-31 19:51:32 -04:00
Gabik21
7c0a402cca
Add previous server to ServerConnectedEvent 2019-10-28 14:45:13 +01:00
Andrew Steinborn
3f321a5219 Indicate plugin loads 2019-10-26 21:10:38 -04:00
Andrew Steinborn
9d5930d96b Integrate BungeeQuack functionality into Velocity 2019-10-20 00:58:55 -04:00