From e7c02ea21a0fb8d12a3ede5af45e14395a549e6c Mon Sep 17 00:00:00 2001 From: James McCulloch Date: Sat, 1 Apr 2023 21:22:04 +1100 Subject: [PATCH] shadow-single-player-owner-fix: (#1687) * shadow-single-player-owner-fix: * Disallow shadowing a single player server owner. Fixes #1442 * shadow-single-player-owner-fix: * Remove some redundant calls --- src/main/java/carpet/commands/PlayerCommand.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/carpet/commands/PlayerCommand.java b/src/main/java/carpet/commands/PlayerCommand.java index d523de37..61434b77 100644 --- a/src/main/java/carpet/commands/PlayerCommand.java +++ b/src/main/java/carpet/commands/PlayerCommand.java @@ -365,6 +365,10 @@ public class PlayerCommand Messenger.m(context.getSource(), "r Cannot shadow fake players"); return 0; } + if (player.getServer().isSingleplayerOwner(player.getGameProfile())) { + Messenger.m(context.getSource(), "r Cannot shadow single-player server owner"); + return 0; + } ServerPlayer sendingPlayer = null; try {