Fix merge conflict

src/main/java/emu/grasscutter/command/commands/Stop.java → src/main/java/emu/grasscutter/command/commands/StopCommand.java

-package emu.grasscutter.command.commands;
-
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.GenshinPlayer;
-
-import java.util.List;
-
-@Command(label = "stop", usage = "stop",
-        description = "Stops the server", permission = "server.stop")
-public class Stop implements CommandHandler {
-
-    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
-        CommandHandler.sendMessage(null, "Server shutting down...");
-        for (GenshinPlayer p : Grasscutter.getGameServer().getPlayers().values()) {
-            CommandHandler.sendMessage(p, "Server shutting down...");
-        }
-
-        System.exit(1);
-    }
-}
+package emu.grasscutter.command.commands;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.game.GenshinPlayer;
+
+import java.util.List;
+
+@Command(label = "stop", usage = "stop",
+        description = "Stops the server", permission = "server.stop")
+public final class StopCommand implements CommandHandler {
+
+    @Override
+    public void execute(GenshinPlayer sender, List<String> args) {
+        CommandHandler.sendMessage(null, "Server shutting down...");
+        for (GenshinPlayer p : Grasscutter.getGameServer().getPlayers().values()) {
+            CommandHandler.sendMessage(p, "Server shutting down...");
+        }
+
+        System.exit(1);
+    }
+}

src/main/java/emu/grasscutter/command/commands/Weather.java → src/main/java/emu/grasscutter/command/commands/WeatherCommand.java

-package emu.grasscutter.command.commands;
-
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.GenshinPlayer;
-import emu.grasscutter.game.props.ClimateType;
-import emu.grasscutter.server.packet.send.PacketSceneAreaWeatherNotify;
-
-import java.util.List;
-
-@Command(label = "weather", usage = "weather <weatherId>",
-        description = "Changes the weather.", aliases = {"w"}, permission = "player.weather")
-public class Weather implements CommandHandler {
-
-    @Override
-    public void execute(GenshinPlayer sender, List<String> args) {
-        if (sender == null) {
-            CommandHandler.sendMessage(null, "Run this command in-game.");
-            return;
-        }
-
-        if (args.size() < 1) {
-            CommandHandler.sendMessage(sender, "Usage: weather <weatherId>");
-            return;
-        }
-
-        try {
-            int weatherId = Integer.parseInt(args.get(0));
-
-            ClimateType climate = ClimateType.getTypeByValue(weatherId);
-
-            sender.getScene().setClimate(climate);
-            sender.getScene().broadcastPacket(new PacketSceneAreaWeatherNotify(sender));
-            CommandHandler.sendMessage(sender, "Changed weather to " + weatherId);
-        } catch (NumberFormatException ignored) {
-            CommandHandler.sendMessage(sender, "Invalid weather ID.");
-        }
-    }
-}
+package emu.grasscutter.command.commands;
+
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.game.props.ClimateType;
+import emu.grasscutter.server.packet.send.PacketSceneAreaWeatherNotify;
+
+import java.util.List;
+
+@Command(label = "weather", usage = "weather <weatherId>",
+        description = "Changes the weather.", aliases = {"w"}, permission = "player.weather")
+public final class WeatherCommand implements CommandHandler {
+
+    @Override
+    public void execute(GenshinPlayer sender, List<String> args) {
+        if (sender == null) {
+            CommandHandler.sendMessage(null, "Run this command in-game.");
+            return;
+        }
+
+        if (args.size() < 1) {
+            CommandHandler.sendMessage(sender, "Usage: weather <weatherId>");
+            return;
+        }
+
+        try {
+            int weatherId = Integer.parseInt(args.get(0));
+
+            ClimateType climate = ClimateType.getTypeByValue(weatherId);
+
+            sender.getScene().setClimate(climate);
+            sender.getScene().broadcastPacket(new PacketSceneAreaWeatherNotify(sender));
+            CommandHandler.sendMessage(sender, "Changed weather to " + weatherId);
+        } catch (NumberFormatException ignored) {
+            CommandHandler.sendMessage(sender, "Invalid weather ID.");
+        }
+    }
+}