Skip to content

Commit 861931c

Browse files
committed
fix(CommandManager): BaseText problems
1 parent 71386f1 commit 861931c

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

src/main/java/io/github/optijava/opt_carpet_addition/mixins/rule/commandLogger/CommandManager_Mixin.java

+12-11
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@
33
//#if MC >= 11900
44
//$$ import com.mojang.brigadier.ParseResults;
55
//#endif
6+
7+
//#if MC >= 12004
8+
//$$ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
9+
//#endif
610
import carpet.CarpetServer;
711
import carpet.utils.Messenger;
812
import io.github.optijava.opt_carpet_addition.OptCarpetSettings;
913
import net.minecraft.server.command.CommandManager;
1014
import net.minecraft.server.command.ServerCommandSource;
1115
import net.minecraft.server.network.ServerPlayerEntity;
12-
import net.minecraft.text.BaseText;
1316
import org.apache.logging.log4j.LogManager;
1417
import org.apache.logging.log4j.Logger;
1518
import org.spongepowered.asm.mixin.Mixin;
@@ -79,23 +82,21 @@ private void logCommand(String command, ServerCommandSource commandSource){
7982
CommandManager_Mixin.LOGGER.info("[OCA Command Logger] %s submit command: %s".formatted(commandSource.getName(), command));
8083

8184
if (OptCarpetSettings.commandLoggerBroadcastToPlayer.equals("true")) {
82-
BaseText baseText = Messenger.c(
85+
Messenger.print_server_message(CarpetServer.minecraft_server, Messenger.c(
8386
"gi [",
8487
"li " + commandSource.getName(),
8588
"gi : " + command + "]"
86-
);
87-
88-
Messenger.print_server_message(CarpetServer.minecraft_server, baseText);
89+
));
8990
} else if (OptCarpetSettings.commandLoggerBroadcastToPlayer.equals("ops")) {
90-
BaseText baseText = Messenger.c(
91+
for (ServerPlayerEntity serverPlayerEntity : CarpetServer.minecraft_server.getPlayerManager().getPlayerList()) {
92+
if (!CarpetServer.minecraft_server.getPlayerManager().isOperator(serverPlayerEntity.getGameProfile())) {
93+
continue;
94+
}
95+
Messenger.m(serverPlayerEntity, Messenger.c(
9196
"gi [",
9297
"li " + commandSource.getName(),
9398
"gi : " + command + "]"
94-
);
95-
96-
for (ServerPlayerEntity serverPlayerEntity : CarpetServer.minecraft_server.getPlayerManager().getPlayerList()) {
97-
if (!CarpetServer.minecraft_server.getPlayerManager().isOperator(serverPlayerEntity.getGameProfile())) continue;
98-
Messenger.m(serverPlayerEntity, baseText);
99+
));
99100
}
100101
}
101102
}

0 commit comments

Comments
 (0)