Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-22 13:15:39 +00:00
Code Issues Projects Releases Wiki Activity

Format code [skip actions]

Browse Source
This commit is contained in:
github-actions 2023-09-18 01:03:10 +00:00
parent 7f5059cb8f
commit ec2bfffdd1
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/emu/grasscutter/game/world/World.java
View File

@ -385,7 +385,7 @@ public class World implements Iterable<Player> {
// Call player teleport event. // Call player teleport event.
PlayerTeleportEvent event = PlayerTeleportEvent event =
new PlayerTeleportEvent(player, teleportProperties, player.getPosition()); new PlayerTeleportEvent(player, teleportProperties, player.getPosition());
// Call event and check if it was canceled. // Call event and check if it was canceled.
event.call(); event.call();
if (event.isCanceled()) { if (event.isCanceled()) {
@ -443,7 +443,6 @@ public class World implements Iterable<Player> {
} }
} }
// Set player position and rotation // Set player position and rotation
if (teleportProperties.getTeleportTo() != null) { if (teleportProperties.getTeleportTo() != null) {
player.getPosition().set(teleportProperties.getTeleportTo()); player.getPosition().set(teleportProperties.getTeleportTo());
@ -461,7 +460,7 @@ public class World implements Iterable<Player> {
player.sendPacket(new PacketPlayerEnterSceneNotify(player, teleportProperties)); player.sendPacket(new PacketPlayerEnterSceneNotify(player, teleportProperties));
if (teleportProperties.getTeleportType() != TeleportType.INTERNAL if (teleportProperties.getTeleportType() != TeleportType.INTERNAL
&& teleportProperties.getTeleportType() != SCRIPT) { && teleportProperties.getTeleportType() != SCRIPT) {
player.getQuestManager().queueEvent(QuestContent.QUEST_CONTENT_ANY_MANUAL_TRANSPORT); player.getQuestManager().queueEvent(QuestContent.QUEST_CONTENT_ANY_MANUAL_TRANSPORT);
} }