diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/entity/SeatBlockEntity.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/entity/SeatBlockEntity.java index 63320eb1b..e39b6c2ae 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/entity/SeatBlockEntity.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/entity/SeatBlockEntity.java @@ -82,12 +82,11 @@ public class SeatBlockEntity extends BlockEntity { @Override public void preRemove() { if (this.seatEntities.isEmpty()) return; - for (Map.Entry entry : this.seatEntities.entrySet()) { - Entity entity = entry.getKey(); - entity.remove(); - this.seatEntities.remove(entity); + try { + this.seatEntities.keySet().forEach(Entity::remove); + } finally { + this.seatEntities.clear(); } - this.seatEntities.clear(); } public void spawnSeatEntityForPlayer(@NotNull Player player, @NotNull Vector3f offset, float yaw, boolean limitPlayerRotation) {