13
0
geforkt von Mirrors/Velocity
Commit graph

1134 Commits

Autor SHA1 Nachricht Datum
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
FivePB (Xer)
83ba7d6051
Changes 1.16-rc1 2020-06-18 18:24:39 +02:00
Five (Xer)
ee64b97b8e
Changes 1.16-pre7 2020-06-16 18:39:51 +02:00
Five (Xer)
a1ab29186b
Changes 1.16-pre6 2020-06-16 17:56:56 +02:00
Five (Xer)
6577b08bdd
Changes 1.16-pre5 2020-06-13 11:26:51 +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
Five (Xer)
78b442a852
Changes 1.16-pre4 and Logic fixes 2020-06-11 23:39:16 +02:00
FivePB (Xer)
8d159408ba
Merge Changes 1.16-pre3
Changes 1.16-pre3
2020-06-10 21:01:16 +02:00
Five (Xer)
101a6a58dd
Changes 1.16-pre3 2020-06-10 21:00:18 +02:00
FivePB (Xer)
4e6144a87c
Merge from indev/future/1.16
Resolve review
2020-06-07 00:52:55 +02:00
Five (Xer)
4e5f708bed
Resolve review 2020-06-07 00:51:21 +02:00
FivePB (Xer)
c004e5769d
Merge Cleanup from indev
Cleanup
2020-06-07 00:36:47 +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
FivePB (Xer)
a213429735
Merge from indev: 1.16-pre2
From indev: 1.16-pre2
2020-06-05 16:02:05 +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
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
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
Luck
4263c4e2d4
Fix config formatting 2020-06-03 00:58:26 +01: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
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
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