Upstream/ViaProxy
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaProxy.git synced 2024-11-29 13:05:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Lenni0451 2024-01-08 18:51:57 +01:00
commit 1be3ab8d1d
No known key found for this signature in database
GPG Key ID: 5D59B86635AD3F2F
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -56,7 +56,7 @@ repositories {
dependencies { dependencies {
include "com.viaversion:viaversion-common:4.10.0-23w51b-SNAPSHOT" include "com.viaversion:viaversion-common:4.10.0-23w51b-SNAPSHOT"
include "com.viaversion:viabackwards-common:4.10.0-23w51b-SNAPSHOT" include "com.viaversion:viabackwards-common:4.10.0-23w51b-SNAPSHOT"
include "com.viaversion:viarewind-common:3.0.6-SNAPSHOT" include "com.viaversion:viarewind-common:3.0.6-20240102.175411-12"
include "net.raphimc:ViaLegacy:2.2.22-SNAPSHOT" include "net.raphimc:ViaLegacy:2.2.22-SNAPSHOT"
include "net.raphimc:ViaAprilFools:2.0.10" include "net.raphimc:ViaAprilFools:2.0.10"
include("net.raphimc:ViaBedrock:0.0.4-SNAPSHOT") { include("net.raphimc:ViaBedrock:0.0.4-SNAPSHOT") {
@ -91,7 +91,7 @@ dependencies {
include("net.raphimc.netminecraft:all:2.4.0-SNAPSHOT") { include("net.raphimc.netminecraft:all:2.4.0-SNAPSHOT") {
exclude group: "com.google.code.gson", module: "gson" exclude group: "com.google.code.gson", module: "gson"
} }
include("net.raphimc:MinecraftAuth:3.1.0-SNAPSHOT") { include("net.raphimc:MinecraftAuth:3.1.0") {
exclude group: "com.google.code.gson", module: "gson" exclude group: "com.google.code.gson", module: "gson"
exclude group: "org.slf4j", module: "slf4j-api" exclude group: "org.slf4j", module: "slf4j-api"
} }

2
gradle.properties
View File

@ -4,4 +4,4 @@ org.gradle.configureondemand=true
maven_group=net.raphimc maven_group=net.raphimc
maven_name=ViaProxy maven_name=ViaProxy
maven_version=3.1.0-SNAPSHOT maven_version=3.1.1-SNAPSHOT

2
src/main/java/net/raphimc/viaproxy/protocolhack/providers/ViaProxyTransferProvider.java
View File

@ -29,7 +29,7 @@ public class ViaProxyTransferProvider extends TransferProvider {
@Override @Override
public void connectToServer(UserConnection user, InetSocketAddress newAddress) { public void connectToServer(UserConnection user, InetSocketAddress newAddress) {
ViaBedrockTransferHolder.addTempRedirect(user.getChannel(), newAddress); ViaBedrockTransferHolder.addTempRedirect(ProxyConnection.fromChannel(user.getChannel()).getC2P(), newAddress);
try { try {
ProxyConnection.fromUserConnection(user).kickClient("§aThe server transferred you to another server §7(§e" + newAddress.getHostName() + ":" + newAddress.getPort() + "§7)§a. Please reconnect to ViaProxy."); ProxyConnection.fromUserConnection(user).kickClient("§aThe server transferred you to another server §7(§e" + newAddress.getHostName() + ":" + newAddress.getPort() + "§7)§a. Please reconnect to ViaProxy.");
} catch (CloseAndReturn ignored) { } catch (CloseAndReturn ignored) {