|
3 | 3 | //#if MC >= 11900
|
4 | 4 | //$$ import com.mojang.brigadier.ParseResults;
|
5 | 5 | //#endif
|
| 6 | + |
| 7 | +//#if MC >= 12004 |
| 8 | +//$$ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; |
| 9 | +//#endif |
6 | 10 | import carpet.CarpetServer;
|
7 | 11 | import carpet.utils.Messenger;
|
8 | 12 | import io.github.optijava.opt_carpet_addition.OptCarpetSettings;
|
9 | 13 | import net.minecraft.server.command.CommandManager;
|
10 | 14 | import net.minecraft.server.command.ServerCommandSource;
|
11 | 15 | import net.minecraft.server.network.ServerPlayerEntity;
|
12 |
| -import net.minecraft.text.BaseText; |
13 | 16 | import org.apache.logging.log4j.LogManager;
|
14 | 17 | import org.apache.logging.log4j.Logger;
|
15 | 18 | import org.spongepowered.asm.mixin.Mixin;
|
@@ -79,23 +82,21 @@ private void logCommand(String command, ServerCommandSource commandSource){
|
79 | 82 | CommandManager_Mixin.LOGGER.info("[OCA Command Logger] %s submit command: %s".formatted(commandSource.getName(), command));
|
80 | 83 |
|
81 | 84 | if (OptCarpetSettings.commandLoggerBroadcastToPlayer.equals("true")) {
|
82 |
| - BaseText baseText = Messenger.c( |
| 85 | + Messenger.print_server_message(CarpetServer.minecraft_server, Messenger.c( |
83 | 86 | "gi [",
|
84 | 87 | "li " + commandSource.getName(),
|
85 | 88 | "gi : " + command + "]"
|
86 |
| - ); |
87 |
| - |
88 |
| - Messenger.print_server_message(CarpetServer.minecraft_server, baseText); |
| 89 | + )); |
89 | 90 | } 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( |
91 | 96 | "gi [",
|
92 | 97 | "li " + commandSource.getName(),
|
93 | 98 | "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 | + )); |
99 | 100 | }
|
100 | 101 | }
|
101 | 102 | }
|
|
0 commit comments