MiniDay/Velocity
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Validate that we have a target

Browse Source
This commit is contained in:
Shane Freeder
2022-06-25 21:38:55 +01:00
parent 662fbc4e3c
commit c03d7e259c
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java
View File

@@ -229,6 +229,7 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler {
@Override @Override
public boolean handle(PlayerCommand packet) { public boolean handle(PlayerCommand packet) {
player.ensureAndGetCurrentServer();
if (!validateChat(packet.getCommand())) { if (!validateChat(packet.getCommand())) {
return true; return true;
} }
@@ -246,6 +247,7 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler {
@Override @Override
public boolean handle(PlayerChat packet) { public boolean handle(PlayerChat packet) {
player.ensureAndGetCurrentServer();
if (!validateChat(packet.getMessage())) { if (!validateChat(packet.getMessage())) {
return true; return true;
} }
@@ -270,6 +272,7 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler {
@Override @Override
public boolean handle(LegacyChat packet) { public boolean handle(LegacyChat packet) {
player.ensureAndGetCurrentServer();
String msg = packet.getMessage(); String msg = packet.getMessage();
if (!validateChat(msg)) { if (!validateChat(msg)) {
return true; return true;
@@ -703,7 +706,15 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler {
return CompletableFuture.completedFuture(null); return CompletableFuture.completedFuture(null);
} }
MinecraftConnection smc = player.ensureAndGetCurrentServer().ensureConnected(); MinecraftConnection smc;
try {
smc = player.ensureAndGetCurrentServer().ensureConnected();
} catch (Exception ex) {
player.disconnect(Component.translatable("velocity.error.player-connection-error",
NamedTextColor.RED));
return CompletableFuture.completedFuture(null);
}
String commandToRun = result.getCommand().orElse(originalCommand); String commandToRun = result.getCommand().orElse(originalCommand);
if (result.isForwardToServer()) { if (result.isForwardToServer()) {
ChatBuilder write = ChatBuilder ChatBuilder write = ChatBuilder