Fix clientside skin changes on 1.13, fixes #1909

DenizenScript · Feb 9, 2019 · 7f0de2d · 7f0de2d
1 parent 7e64265
commit 7f0de2d
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/v1_13_R2/src/main/java/net/aufdemrand/denizen/nms/impl/ProfileEditor_v1_13_R2.java b/v1_13_R2/src/main/java/net/aufdemrand/denizen/nms/impl/ProfileEditor_v1_13_R2.java
@@ -12,11 +12,10 @@
 import net.minecraft.server.v1_13_R2.PacketPlayOutEntityDestroy;
 import net.minecraft.server.v1_13_R2.PacketPlayOutNamedEntitySpawn;
 import net.minecraft.server.v1_13_R2.PacketPlayOutPlayerInfo;
-import net.minecraft.server.v1_13_R2.PacketPlayOutRespawn;
 import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
 import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPlayer;
 import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.scheduler.BukkitRunnable;
 
 import java.lang.reflect.Field;
@@ -47,14 +46,8 @@ public void run() {
                     }
                     else {
                         if (isSkinChanging) {
-                            boolean isFlying = player.isFlying();
-                            PacketHelper_v1_13_R2.sendPacket(player, new PacketPlayOutRespawn(
-                                    entityPlayer.getWorldServer().dimension,
-                                    entityPlayer.getWorld().getDifficulty(),
-                                    entityPlayer.getWorld().worldData.getType(),
-                                    entityPlayer.playerInteractManager.getGameMode()));
-                            player.teleport(player.getLocation(), PlayerTeleportEvent.TeleportCause.PLUGIN);
-                            player.setFlying(isFlying);
+                            ((CraftServer) Bukkit.getServer()).getHandle().moveToWorld(
+                                    entityPlayer, entityPlayer.dimension, true, player.getLocation(), false);
                         }
                         player.updateInventory();
                     }