Merge remote-tracking branch 'origin/dev-4.0' into dev-4.0

# Conflicts:
#	src/main/java/emu/grasscutter/game/player/Player.java
#	src/main/java/emu/grasscutter/game/player/TeamManager.java
#	src/main/java/emu/grasscutter/game/world/Scene.java

src/main/java/emu/grasscutter/command/commands/GroupCommand.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 @Command(
         label = "group",
-        aliases = {"g"},
+        aliases = {"gr"},
         usage = {"(refresh) [<groupId>] [<suiteId>]"},
         permission = "player.group",
         permissionTargeted = "player.group.others")

src/main/java/emu/grasscutter/command/commands/SoundCommand.java

@@ -12,7 +12,7 @@ import lombok.val;
 
 @Command(
         label = "sound",
-        aliases = {"s", "audio"},
+        aliases = {"audio"},
         usage = {"[<audioname>] [<x><y><z>]"},
         permission = "player.sound",
         permissionTargeted = "player.sound.others")