From 15b02ff390f4040ef1b3e06920596ccf40214b34 Mon Sep 17 00:00:00 2001
From: ineanto <pantoine.rochas@gmail.com>
Date: Thu, 29 Jun 2023 11:14:46 +0200
Subject: [PATCH] refactor(disguise): update player after disguise

---
 .../java/xyz/atnrch/nicko/disguise/AppearanceManager.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/xyz/atnrch/nicko/disguise/AppearanceManager.java b/src/main/java/xyz/atnrch/nicko/disguise/AppearanceManager.java
index 2f40ae2..475fbb6 100644
--- a/src/main/java/xyz/atnrch/nicko/disguise/AppearanceManager.java
+++ b/src/main/java/xyz/atnrch/nicko/disguise/AppearanceManager.java
@@ -99,6 +99,7 @@ public class AppearanceManager {
 
         final WrappedGameProfile gameProfile = WrappedGameProfile.fromPlayer(player).withName(displayName);
         final ActionResult<Void> result = updateGameProfileSkin(gameProfile, skinChange);
+        final boolean wasFlying = player.isFlying();
         if (!result.isError()) {
             updateMetadata();
             updateTabList(gameProfile, displayName);
@@ -106,6 +107,8 @@ public class AppearanceManager {
             updateOthers();
         }
         player.teleport(player.getLocation(), PlayerTeleportEvent.TeleportCause.PLUGIN);
+        player.setFlying(wasFlying);
+        player.updateInventory();
         return new ActionResult<>();
     }
 
@@ -157,7 +160,6 @@ public class AppearanceManager {
 
     private void respawnPlayer() {
         final World world = player.getWorld();
-        final boolean wasFlying = player.isFlying();
         final WrapperPlayServerRespawn respawn = new WrapperPlayServerRespawn();
         respawn.setDimension(world);
         respawn.setSeed(world.getSeed());
@@ -166,8 +168,6 @@ public class AppearanceManager {
         respawn.setDifficulty(world.getDifficulty());
         respawn.setCopyMetadata(true);
         respawn.sendPacket(player);
-        player.setFlying(wasFlying);
-        player.updateInventory();
     }
 
     @SuppressWarnings("deprecation")