3
0
Mirror von https://github.com/PaperMC/Velocity.git synchronisiert 2024-12-27 00:23:19 +01:00
Commit graph

1021 Commits

Autor SHA1 Nachricht Datum
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
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