Add more events

Merge pull request Grasscutters#1516 from Grasscutters/more-events
GoJam11 · Aug 4, 2022 · d05b320 · d05b320
2 parents 9a104f6 + a3e0f7f
commit d05b320
Show file tree

Hide file tree

Showing 23 changed files with 805 additions and 552 deletions.
diff --git a/src/main/java/emu/grasscutter/command/commands/TeleportAllCommand.java b/src/main/java/emu/grasscutter/command/commands/TeleportAllCommand.java
@@ -3,7 +3,7 @@
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.utils.Position;
+import emu.grasscutter.server.event.player.PlayerTeleportEvent.TeleportType;
 
 import java.util.List;
 
@@ -22,9 +22,8 @@ public void execute(Player sender, Player targetPlayer, List<String> args) {
         for (Player player : targetPlayer.getWorld().getPlayers()) {
             if (player.equals(targetPlayer))
                 continue;
-            Position pos = targetPlayer.getPosition();
 
-            player.getWorld().transferPlayerToScene(player, targetPlayer.getSceneId(), pos);
+            player.getWorld().transferPlayerToScene(player, targetPlayer.getSceneId(), TeleportType.COMMAND, targetPlayer.getPosition());
         }
 
         CommandHandler.sendMessage(sender, translate(sender, "commands.teleportAll.success"));

diff --git a/src/main/java/emu/grasscutter/command/commands/TeleportCommand.java b/src/main/java/emu/grasscutter/command/commands/TeleportCommand.java
@@ -3,6 +3,7 @@
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.game.player.Player;
+import emu.grasscutter.server.event.player.PlayerTeleportEvent.TeleportType;
 import emu.grasscutter.utils.Position;
 
 import java.util.List;
@@ -40,20 +41,21 @@ public void execute(Player sender, Player targetPlayer, List<String> args) {
                 }  // Fallthrough
             case 3:
                 try {
-                    x = parseRelative(args.get(0), x);
-                    y = parseRelative(args.get(1), y);
-                    z = parseRelative(args.get(2), z);
+                    x = this.parseRelative(args.get(0), x);
+                    y = this.parseRelative(args.get(1), y);
+                    z = this.parseRelative(args.get(2), z);
                 } catch (NumberFormatException ignored) {
                     CommandHandler.sendMessage(sender, translate(sender, "commands.teleport.invalid_position"));
                 }
                 break;
             default:
-                sendUsageMessage(sender);
+                this.sendUsageMessage(sender);
                 return;
         }
 
         Position target_pos = new Position(x, y, z);
-        boolean result = targetPlayer.getWorld().transferPlayerToScene(targetPlayer, sceneId, target_pos);
+        boolean result = targetPlayer.getWorld().transferPlayerToScene(targetPlayer, sceneId, TeleportType.COMMAND, target_pos);
+
         if (!result) {
             CommandHandler.sendMessage(sender, translate(sender, "commands.teleport.exists_error"));
         } else {