R3944Realms/Ambassador
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small bug fix

Browse Source
This commit is contained in:
Adrian Bergqvist 2022-11-29 17:20:25 +01:00
parent ba94616ee7
commit 3b6a10f11d
No known key found for this signature in database
GPG Key ID: FAE7D8EDE225E686
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -4,7 +4,7 @@ plugins {
} }
group 'org.adde0109' group 'org.adde0109'
version '1.1.5-alpha' version '1.1.5B-alpha'
repositories { repositories {
maven { maven {

2
src/main/java/org/adde0109/ambassador/Ambassador.java
View File

@ -25,7 +25,7 @@ import org.slf4j.Logger;
import java.nio.file.Path; import java.nio.file.Path;
@Plugin(id = "ambassador", name = "Ambassador", version = "1.1.5-alpha", authors = {"adde0109"}) @Plugin(id = "ambassador", name = "Ambassador", version = "1.1.5B-alpha", authors = {"adde0109"})
public class Ambassador { public class Ambassador {
public ProxyServer server; public ProxyServer server;

12
src/main/java/org/adde0109/ambassador/velocity/backend/ForgeHandshakeSessionHandler.java
View File

@ -4,6 +4,7 @@ import com.velocitypowered.proxy.VelocityServer;
import com.velocitypowered.proxy.connection.MinecraftSessionHandler; import com.velocitypowered.proxy.connection.MinecraftSessionHandler;
import com.velocitypowered.proxy.connection.backend.LoginSessionHandler; import com.velocitypowered.proxy.connection.backend.LoginSessionHandler;
import com.velocitypowered.proxy.connection.backend.VelocityServerConnection; import com.velocitypowered.proxy.connection.backend.VelocityServerConnection;
import com.velocitypowered.proxy.protocol.MinecraftPacket;
import com.velocitypowered.proxy.protocol.packet.Disconnect; import com.velocitypowered.proxy.protocol.packet.Disconnect;
import com.velocitypowered.proxy.protocol.packet.LoginPluginMessage; import com.velocitypowered.proxy.protocol.packet.LoginPluginMessage;
import com.velocitypowered.proxy.protocol.packet.ServerLoginSuccess; import com.velocitypowered.proxy.protocol.packet.ServerLoginSuccess;
@ -33,7 +34,7 @@ public class ForgeHandshakeSessionHandler implements MinecraftSessionHandler {
if (!(serverConnection.getConnection().getType() instanceof ForgeFMLConnectionType)) { if (!(serverConnection.getConnection().getType() instanceof ForgeFMLConnectionType)) {
if (!(serverConnection.getPlayer().getConnection().getType() instanceof ForgeFMLConnectionType clientType)) { if (!(serverConnection.getPlayer().getConnection().getType() instanceof ForgeFMLConnectionType clientType)) {
final String reason = "This server has mods that require Forge to be installed on the client. Contact your server admin for more details."; final String reason = "This server has mods that require Forge to be installed on the client. Contact your server admin for more details.";
original.handle(new Disconnect(reason)); original.handle(Disconnect.create(Component.text(reason, NamedTextColor.RED),serverConnection.getPlayer().getProtocolVersion()));
return true; return true;
} }
serverConnection.getConnection().setType(clientType); serverConnection.getConnection().setType(clientType);
@ -53,16 +54,17 @@ public class ForgeHandshakeSessionHandler implements MinecraftSessionHandler {
return original.handle(packet); return original.handle(packet);
} }
@Override
public void handleUnknown(ByteBuf buf) {
original.handleUnknown(buf);
}
@Override @Override
public void disconnected() { public void disconnected() {
original.disconnected(); original.disconnected();
} }
public void handleGeneric(MinecraftPacket packet) {
if (!packet.handle(original))
original.handleGeneric(packet);
}
public MinecraftSessionHandler getOriginal() { public MinecraftSessionHandler getOriginal() {
return this.original; return this.original;
} }