From ac1b50a9576570b559b8b0cf750321de96dbdb3e Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Thu, 31 Aug 2023 18:29:59 -0500 Subject: [PATCH] clean: remove old removal passenger logic from PlayerQuitEvent --- .../listener/PlayerConnectionListener.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerConnectionListener.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerConnectionListener.java index e74389a6..db27f7be 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerConnectionListener.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerConnectionListener.java @@ -8,8 +8,6 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUsers; import com.hibiscusmc.hmccosmetics.user.manager.UserEmoteManager; import com.hibiscusmc.hmccosmetics.util.MessagesUtil; import org.bukkit.Bukkit; -import org.bukkit.entity.Entity; -import org.bukkit.entity.EntityType; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; @@ -51,16 +49,7 @@ public class PlayerConnectionListener implements Listener { @EventHandler(priority = EventPriority.MONITOR) public void onPlayerQuit(@NotNull PlayerQuitEvent event) { CosmeticUser user = CosmeticUsers.getUser(event.getPlayer()); - if (user == null) { // Remove any passengers if a user failed to initialize. Bugs can cause this to happen - if (!event.getPlayer().getPassengers().isEmpty()) { - for (Entity entity : event.getPlayer().getPassengers()) { - if (entity.getType() == EntityType.ARMOR_STAND) { - entity.remove(); - } - } - } - return; - } + if (user == null) return; // Player never initialized, don't do anything if (user.isInWardrobe()) user.leaveWardrobe(); if (user.getUserEmoteManager().isPlayingEmote()) { user.getUserEmoteManager().stopEmote(UserEmoteManager.StopEmoteReason.CONNECTION);