From 57eade904b446b49048e9c6378e303e6abbacd90 Mon Sep 17 00:00:00 2001
From: jhqwqmc <2110242767@qq.com>
Date: Tue, 17 Jun 2025 09:13:10 +0800
Subject: [PATCH] =?UTF-8?q?fix(furniture):=20=E4=BF=AE=E5=A4=8D=E7=8E=A9?=
 =?UTF-8?q?=E5=AE=B6=E5=9D=90=E5=AE=B6=E5=85=B7=E5=A4=B1=E8=B4=A5=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../craftengine/bukkit/entity/furniture/BukkitFurniture.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/BukkitFurniture.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/BukkitFurniture.java
index 78a776bb0..6c8c3d4d3 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/BukkitFurniture.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/BukkitFurniture.java
@@ -347,7 +347,10 @@ public class BukkitFurniture implements Furniture {
                     itemDisplay.getPersistentDataContainer().set(BukkitFurnitureManager.FURNITURE_SEAT_VECTOR_3F_KEY, PersistentDataType.STRING, seat.offset().x + ", " + seat.offset().y + ", " + seat.offset().z);
                 });
         this.seats.add(new WeakReference<>(seatEntity));
-        seatEntity.addPassenger(player);
+        if (!seatEntity.addPassenger(player)) {
+            seatEntity.remove();
+            this.removeOccupiedSeat(seat.offset());
+        }
     }
 
     private Location calculateSeatLocation(Seat seat) {