Merged
Conversation
…g and connection result management
…rror reporting and server status management
…proved proxy handling
…ing-transfers # Conflicts: # surf-core-api/surf-core-api-paper/src/main/kotlin/dev/slne/surf/core/api/paper/command/argument/PermissionCommonSurfServerArgument.kt
Contributor
There was a problem hiding this comment.
Pull request overview
This pull request implements a feature for awaiting proxy transfers with proper status tracking. The changes add support for transferring players between proxy servers using Minecraft's modern transfer protocol, with comprehensive error handling, tracking, and reporting.
Changes:
- Added
sendPlayerAwaitingAPI method for proxy transfers with status tracking using Redis-based watchers - Implemented
SendPlayerToProxyRequestRedis request/response system with acknowledgment and result tracking - Enhanced shutdown logic to use awaiting transfers and provide detailed status reporting
- Added
transferredboolean field toSurfPlayerto track transfer state across the network
Reviewed changes
Copilot reviewed 28 out of 28 changed files in this pull request and generated 10 comments.
Show a summary per file
| File | Description |
|---|---|
| SendPlayerToProxyHandler.kt | New handler for proxy transfer requests via Redis |
| SendPlayerToServerHandler.kt | Updated import path for refactored request classes |
| VelocityServerListener.kt | Enhanced shutdown with awaiting transfers and comprehensive status reporting |
| ConnectionListener.kt | Sets transferred flag based on authentication listener transfer tracking |
| AuthenticationListener.kt | Added UUID tracking set for player transfers |
| VelocityMain.kt | Registered new SendPlayerToProxyHandler (replaced SendPlayerToServerHandler) |
| PlayerConnectListener.kt | Added transfer confirmation logic and response publishing on player join |
| SurfCoreCommand.kt | Restructured test command with separate server/proxy subcommands |
| NetworkServerCommand.kt | Updated to use awaiting transfer API with result handling |
| NetworkSendCommand.kt | Added awaiting transfer support for proxy sends with detailed error reporting |
| PaperBootstrap.kt | Added validation for server configuration fields |
| PlayerServerConnectionResultWatcher.kt | Refactored package structure (moved to watcher subpackage) |
| PlayerProxyConnectionResultWatcher.kt | New watcher for proxy transfer results with Redis-based deduplication |
| SendPlayerToServerRequest.kt | Moved to request subpackage and updated types |
| SendPlayerToProxyRequest.kt | New request/response definitions for proxy transfers |
| SendPlayerToServerListener.kt | Updated imports for refactored classes |
| SendPlayerToProxyListener.kt | New listener for proxy transfer response events |
| RedisLoader.kt | Added SendPlayerToProxyListener registration |
| SurfCoreApiImpl.kt | Implemented sendPlayerAwaiting for proxies and added getCommonServer methods |
| SurfPlayerServiceImpl.kt | Added transferred field initialization |
| SurfPlayerRepository.kt | Added transferred field to database mapping |
| SurfCommonServerArgument.kt (velocity) | Updated to use getCommonServerByName |
| SurfCommonServerArgument.kt (paper) | Updated to use getCommonServerByName and getCommonServers |
| PermissionCommonSurfServerArgument.kt | Updated to use getCommonServerByName and getCommonServers |
| SurfProxyServerConnectionResult.kt | New result class for proxy connection status |
| SurfPlayerSerializer.kt | Added transferred field serialization/deserialization |
| SurfPlayer.kt | Added transferred boolean field |
| SurfCoreApi.kt | Added sendPlayerAwaiting and getCommonServer methods to API |
| gradle.properties | Version bump to 1.21.11-1.2.1-SNAPSHOT |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
surf-core-paper/src/main/kotlin/dev/slne/surf/core/paper/listener/PlayerConnectListener.kt
Show resolved
Hide resolved
...in/kotlin/dev/slne/surf/core/core/common/redis/watcher/PlayerProxyConnectionResultWatcher.kt
Outdated
Show resolved
Hide resolved
surf-core-paper/src/main/kotlin/dev/slne/surf/core/paper/command/NetworkSendCommand.kt
Outdated
Show resolved
Hide resolved
...locity/src/main/kotlin/dev/slne/surf/core/velocity/redis/handler/SendPlayerToProxyHandler.kt
Show resolved
Hide resolved
surf-core-velocity/src/main/kotlin/dev/slne/surf/core/velocity/VelocityMain.kt
Show resolved
Hide resolved
surf-core-paper/src/main/kotlin/dev/slne/surf/core/paper/listener/PlayerConnectListener.kt
Outdated
Show resolved
Hide resolved
surf-core-velocity/src/main/kotlin/dev/slne/surf/core/velocity/listener/ConnectionListener.kt
Outdated
Show resolved
Hide resolved
...in/kotlin/dev/slne/surf/core/core/common/redis/watcher/PlayerProxyConnectionResultWatcher.kt
Outdated
Show resolved
Hide resolved
...core-velocity/src/main/kotlin/dev/slne/surf/core/velocity/listener/VelocityServerListener.kt
Outdated
Show resolved
Hide resolved
...locity/src/main/kotlin/dev/slne/surf/core/velocity/redis/handler/SendPlayerToProxyHandler.kt
Show resolved
Hide resolved
…surf/core/core/common/redis/watcher/PlayerProxyConnectionResultWatcher.kt Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…at/awaiting-transfers
…ner/PlayerConnectListener.kt Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…at/awaiting-transfers
…surf/core/core/common/redis/watcher/PlayerProxyConnectionResultWatcher.kt Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…/listener/VelocityServerListener.kt Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…at/awaiting-transfers
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 28 out of 28 changed files in this pull request and generated 13 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
...in/kotlin/dev/slne/surf/core/core/common/redis/watcher/PlayerProxyConnectionResultWatcher.kt
Show resolved
Hide resolved
...core/surf-core-core-common/src/main/kotlin/dev/slne/surf/core/core/common/SurfCoreApiImpl.kt
Show resolved
Hide resolved
...core-velocity/src/main/kotlin/dev/slne/surf/core/velocity/listener/VelocityServerListener.kt
Show resolved
Hide resolved
...core-velocity/src/main/kotlin/dev/slne/surf/core/velocity/listener/VelocityServerListener.kt
Show resolved
Hide resolved
surf-core-paper/src/main/kotlin/dev/slne/surf/core/paper/listener/PlayerConnectListener.kt
Show resolved
Hide resolved
...mmon/src/main/kotlin/dev/slne/surf/core/api/common/player/serializer/SurfPlayerSerializer.kt
Show resolved
Hide resolved
...mon/src/main/kotlin/dev/slne/surf/core/core/common/redis/request/SendPlayerToProxyRequest.kt
Show resolved
Hide resolved
surf-core-paper/src/main/kotlin/dev/slne/surf/core/paper/command/NetworkServerCommand.kt
Show resolved
Hide resolved
...-api/surf-core-api-common/src/main/kotlin/dev/slne/surf/core/api/common/player/SurfPlayer.kt
Show resolved
Hide resolved
surf-core-velocity/src/main/kotlin/dev/slne/surf/core/velocity/auth/AuthenticationListener.kt
Show resolved
Hide resolved
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.