13
0
geforkt von Mirrors/Velocity
Commit graph

664 Commits

Autor SHA1 Nachricht Datum
Andrew Steinborn
ce6b061b79 Make Velocity's server list ping behavior more conformant.
This fixes pinging with 1.7.x and with certain ping libraries that send
the -1 protocol version.
2018-12-07 17:24:41 -05:00
Andrew Steinborn
811d7400c3
Merge pull request #158 from lucko/fix/event-bus
Some event bus related fixes
2018-12-05 20:03:07 -05:00
Luck
6ff9180987
Remove redundant extra lambda in EventManager#fire implementation 2018-12-04 00:03:47 +00:00
Luck
3d3d6adf04
Remove redundant null check in VelocityMethodScanner 2018-12-03 23:55:39 +00:00
Luck
cfae542dd2
Slightly optimize SimpleEventBus usage in VelocityEventManager 2018-12-03 23:53:50 +00:00
Luck
43da3d4541
Allow the same EventHandler to be registered with different PostOrders
The #equals implementations in KyoriToVelocityHandler silently prevented this previously.
2018-12-03 23:53:06 +00:00
Andrew Steinborn
5b9a8f160b Fallback to plugin ID. 2018-12-02 01:59:46 -05:00
Andrew Steinborn
65ca41cdb5 Warn when using Guava Subscribe annotation.
Additionally, registration of listeners will not be fatal if an
exception was thrown.
2018-12-02 01:58:21 -05:00
Andrew Steinborn
a3bfa292c6
Merge pull request #139 from VelocityPowered/reload-command
Reload command
2018-12-01 18:04:09 -05:00
Andrew Steinborn
458d2e4d74 Netty 4.1.32.Final 2018-12-01 17:56:45 -05:00
Andrew Steinborn
bb01dc9edf Revert "Revert "Refactor Forge support to track the handshake & include keepalives""
This reverts commit dc67ee99ed.
2018-12-01 17:11:41 -05:00
Andrew Steinborn
a9ae53e527 Introduce ConsoleCommandSource. See #155 2018-12-01 17:08:34 -05:00
Andrew Steinborn
773d9f0470
Merge pull request #156 from VelocityPowered/revert-136-forge-handshake
Revert "Refactor Forge support to track the handshake & include keepalives"
2018-12-01 14:04:30 -05:00
Andrew Steinborn
dc67ee99ed
Revert "Refactor Forge support to track the handshake & include keepalives" 2018-12-01 14:04:14 -05:00
Andrew Steinborn
ed4994a792
Merge pull request #136 from dualspiral/forge-handshake
Refactor Forge support to track the handshake & include keepalives
2018-12-01 14:03:16 -05:00
Andrew Steinborn
6e37fa5f33 When handling TabCompleteResponse, check if we have a command.
Fixes #154
2018-11-30 19:14:51 -05:00
Andrew Steinborn
d3d683dfc0 Document velocity.toml more carefully. 2018-11-30 16:17:36 -05:00
Andrew Steinborn
edfdcf3d53 Document ServerPreConnectEvent more carefully. 2018-11-25 14:54:03 -05:00
Daniel Naylor
9260d1071a Fix from API breakage 2018-11-25 10:30:14 +00:00
Daniel Naylor
a4852d7264 Silly me... 2018-11-25 10:19:46 +00:00
Daniel Naylor
2b49bb96bf This goes here 2018-11-25 10:19:46 +00:00
Daniel Naylor
9bab6b8c8e Update for master changes and comments 2018-11-25 10:19:46 +00:00
Daniel Naylor
3adf36f712 Fix comments. We still seem to have a plugin message coming though on login,
can't see why...
2018-11-25 10:19:46 +00:00
Daniel Naylor
8716e09d21 Don't use a magic string 2018-11-25 10:19:16 +00:00
Daniel Naylor
ccd37e5b9c Track the forge handshake and re-engineer Forge support
The system is now organised into connection types and phases. Most of the core Velocity logic is now isolated from the Forge logic to allow for simpler maintainance and to try to support future loaders (Forge 1.13?) in a cleaner fashion.

There are a couple of points where Forge specific calls are in the main body, but these have been minimised.

Also send keepalives from Velocity to during backend server switch and after Forge handshake, to try to help Forge clients
2018-11-25 10:18:48 +00:00
Andrew Steinborn
8f859b980c
Merge pull request #135 from Crypnotic/protocol-constants-rework
Expose ProtocolConstants to the API
2018-11-25 01:27:17 -05:00
Andrew Steinborn
2ac1855868 Update Netty to 4.1.31.Final. 2018-11-25 00:43:14 -05:00
Andrew Steinborn
5eeca16f7e Apply final modifier 2018-11-24 21:42:08 -05:00
Andrew Steinborn
a083dfd3a4 Merge branch 'master' into reload-command
# Conflicts:
#	proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java
2018-11-24 21:41:12 -05:00
Andrew Steinborn
9a9b6f9ab3 Rename ConnectionManager#shutdown(ISA) -> ConnectionManager#close(ISA) 2018-11-24 21:38:26 -05:00
Andrew Steinborn
bb4945b513 Fix awkward disconnection issues. 2018-11-24 20:12:29 -05:00
Andrew Steinborn
107f3fa8c6
Merge pull request #148 from SixStudioo/master
Fix GS4 k, v section
2018-11-24 16:47:10 -05:00
js6pak
97725ed906
Fix GS4 k, v section
Add "plugins" key before plugins list
2018-11-24 22:36:03 +01:00
Andrew Steinborn
d9be210fe3 Fix this up 2018-11-23 18:54:53 -05:00
Andrew Steinborn
436c1624bc Make sure to mark the in-flight connection. 2018-11-23 18:42:14 -05:00
Andrew Steinborn
e2ad6b740a Do not allow connections till JoinGame is received. 2018-11-23 18:42:14 -05:00
Andrew Steinborn
81d8c8374e Fix up Checkstyle styles from PR 2018-11-23 03:23:45 -05:00
Andrew Steinborn
38f460d56c
Merge pull request #141 from VelocityPowered/options
Allow specifying bind port via command line
2018-11-23 03:19:03 -05:00
Andrew Steinborn
40e7ef784f Enhance /velocity command. Closes #145 2018-11-22 19:29:02 -05:00
kashike
960f2cf890
Merge pull request #147 from LartyHD/Bug-Fix-#146
Bug Fix #146
2018-11-22 16:04:32 -08:00
Lars Artmann
f241023282
Bug Fix #146 2018-11-22 22:51:19 +01:00
Andrew Steinborn
cf5a244996
Merge pull request #143 from LartyHD/patch-1
Removed a unnecessary check
2018-11-22 00:02:38 -05:00
Lars Artmann
9dad1a7020
Removed a unnecessary check
In "hasPermission" is the removed check already included
2018-11-22 05:54:05 +01:00
Andrew Steinborn
1515c5069b Fix up some stuff 2018-11-21 23:36:47 -05:00
Andrew Steinborn
904e1367a2 Must count down here. 2018-11-21 16:01:58 -05:00
Andrew Steinborn
402398010e Handle changing server addresses in config (not tested). 2018-11-21 15:57:21 -05:00
kashike
7da847bfac Allow specifying bind port via command line
adds #140
2018-11-20 21:56:34 -08:00
Andrew Steinborn
01503be4fa Handle switching bind (MC and GS4). 2018-11-20 22:30:52 -05:00
Crypnotic
6b4c809c39 Rework and expose ProtocolVersion to the API 2018-11-20 17:15:48 -06:00
Andrew Steinborn
0d94080c74 Remove unneeded null checks 2018-11-20 12:23:28 -05:00