Add command to spoof a player into spectator

Legacy-Edition-Minigames · Jun 26, 2024 · c7410f6 · c7410f6
1 parent 70b61aa
commit c7410f6
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 6 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ yarn_mappings=1.21+build.2
 loader_version=0.15.11
 
 # Fabric API
-fabric_version=0.100.3+1.21
+fabric_version=0.100.4+1.21
 
 # Mod Properties
 mod_version=1.1.0-1.21

diff --git a/src/main/java/net/kyrptonaught/serverutils/customWorldBorder/CustomWorldBorderManager.java b/src/main/java/net/kyrptonaught/serverutils/customWorldBorder/CustomWorldBorderManager.java
@@ -129,7 +129,7 @@ public static void updateWorldBorderToAll(List<ServerPlayerEntity> players, Worl
     }
 
     private static boolean hasLCH(ServerPlayerEntity player) {
-        return ServerPlayNetworking.canSend(player, CustomWorldBorderNetworking.CUSTOM_BORDER_PACKET);
+        return ServerPlayNetworking.canSend(player, CustomWorldBorderPacket.PACKET_ID);
     }
 
     public static class SyncedBorder {

diff --git a/...main/java/net/kyrptonaught/serverutils/customWorldBorder/CustomWorldBorderNetworking.java b/...main/java/net/kyrptonaught/serverutils/customWorldBorder/CustomWorldBorderNetworking.java
@@ -3,13 +3,9 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
-import net.kyrptonaught.serverutils.ServerUtilsMod;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.util.Identifier;
 
 public class CustomWorldBorderNetworking {
-    public static final Identifier CUSTOM_BORDER_PACKET = Identifier.of(ServerUtilsMod.CustomWorldBorder.getMOD_ID(), "customborder");
-
 
     public static void sendCustomWorldBorderPacket(ServerPlayerEntity player, double xCenter, double zCenter, double xSize, double zSize) {
         ServerPlayNetworking.send(player, new CustomWorldBorderPacket(xCenter, zCenter, xSize, zSize));

diff --git a/src/main/java/net/kyrptonaught/serverutils/syncedKeybinds/SyncKeybindsPacket.java b/src/main/java/net/kyrptonaught/serverutils/syncedKeybinds/SyncKeybindsPacket.java
@@ -21,6 +21,7 @@ public static SyncKeybindsPacket read(RegistryByteBuf buf) {
     }
 
     public void write(RegistryByteBuf buf) {
+        buf.writeInt(keybinds.size());
         keybinds.forEach((s, keybindConfigItem) -> keybindConfigItem.writeToPacket(s, buf));
     }
 

diff --git a/src/main/java/net/kyrptonaught/serverutils/utilityCommands/UtilCommandsMod.java b/src/main/java/net/kyrptonaught/serverutils/utilityCommands/UtilCommandsMod.java
@@ -1,6 +1,7 @@
 package net.kyrptonaught.serverutils.utilityCommands;
 
 import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.arguments.BoolArgumentType;
 import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
 import net.kyrptonaught.serverutils.Module;
 import net.minecraft.command.argument.BlockPosArgumentType;
@@ -10,6 +11,7 @@
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.attribute.EntityAttributes;
 import net.minecraft.network.packet.s2c.play.EntityAttributesS2CPacket;
+import net.minecraft.network.packet.s2c.play.GameStateChangeS2CPacket;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.command.FunctionCommand;
@@ -18,6 +20,7 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.GameMode;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -96,6 +99,25 @@ public void registerCommands(CommandDispatcher<ServerCommandSource> dispatcher)
                                         }
                                     }
 
+                                    return 1;
+                                }))));
+
+        dispatcher.register(CommandManager.literal("spoofspectator")
+                .requires((source) -> source.hasPermissionLevel(2))
+                .then(CommandManager.argument("player", EntityArgumentType.players())
+                        .then(CommandManager.argument("spoof", BoolArgumentType.bool())
+                                .executes(context -> {
+                                    Collection<ServerPlayerEntity> players = EntityArgumentType.getPlayers(context, "player");
+                                    boolean spoof = BoolArgumentType.getBool(context, "spoof");
+
+                                    for (ServerPlayerEntity player : players) {
+                                        if (spoof) {
+                                            player.networkHandler.sendPacket(new GameStateChangeS2CPacket(GameStateChangeS2CPacket.GAME_MODE_CHANGED, (float) GameMode.SPECTATOR.getId()));
+                                        } else {
+                                            player.networkHandler.sendPacket(new GameStateChangeS2CPacket(GameStateChangeS2CPacket.GAME_MODE_CHANGED, (float) player.interactionManager.getGameMode().getId()));
+                                        }
+                                    }
+
                                     return 1;
                                 }))));
     }