Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-17 19:33:26 +08:00
Code Issues Projects Releases Wiki Activity

Move PlayerTeleportEvent occurrences into World

Browse Source
This commit is contained in:
KingRainbow44
2022-08-01 21:25:29 -04:00
Unverified
parent 1de402bd6f
commit 89575f587e
7 changed files with 78 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/emu/grasscutter/command/commands/TeleportAllCommand.java
+2 -9
View File
@@ -3,8 +3,7 @@ package emu.grasscutter.command.commands;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.server.event.player.PlayerTeleportEvent;
import emu.grasscutter.utils.Position;
import emu.grasscutter.server.event.player.PlayerTeleportEvent.TeleportType;
import java.util.List;
@@ -24,13 +23,7 @@ public final class TeleportAllCommand implements CommandHandler {
if (player.equals(targetPlayer))
continue;
Position pos = targetPlayer.getPosition();
PlayerTeleportEvent event = new PlayerTeleportEvent(targetPlayer, PlayerTeleportEvent.TeleportType.COMMAND,
targetPlayer.getPosition(), pos);
event.call();
if(!event.isCanceled())
player.getWorld().transferPlayerToScene(player, targetPlayer.getSceneId(), event.getDestination());
player.getWorld().transferPlayerToScene(player, targetPlayer.getSceneId(), TeleportType.COMMAND, targetPlayer.getPosition());
}
CommandHandler.sendMessage(sender, translate(sender, "commands.teleportAll.success"));