Move entityBlocked

Author: gecolay

core/src/main/java/dev/geco/gsit/service/SitService.java

@@ -134,6 +134,7 @@ public boolean removeSeat(GSeat seat, GStopReason stopReason, boolean useSafeDis
         if(preEntityStopSitEvent.isCancelled() && stopReason.isCancellable()) return false;
 
         Entity entity = seat.getEntity();
+        entityBlocked.add(entity.getUniqueId());
         if(useSafeDismount) handleSafeSeatDismount(seat);
 
         Set<GSeat> blockSeatList = blockSeats.remove(seat.getBlock());
@@ -143,6 +144,7 @@ public boolean removeSeat(GSeat seat, GStopReason stopReason, boolean useSafeDis
         }
         seats.remove(entity.getUniqueId());
         seat.getSeatEntity().remove();
+        entityBlocked.remove(entity.getUniqueId());
         Bukkit.getPluginManager().callEvent(new EntityStopSitEvent(seat, stopReason));
         sitUsageNanoTime += seat.getLifetimeInNanoSeconds();
 
@@ -157,17 +159,13 @@ public void handleSafeSeatDismount(GSeat seat) {
 
         Location returnLocation = gSitMain.getConfigService().GET_UP_RETURN ? seat.getReturnLocation() : upLocation;
 
-        entityBlocked.add(entity.getUniqueId());
-
         Location entityLocation = entity.getLocation();
 
         returnLocation.setYaw(entityLocation.getYaw());
         returnLocation.setPitch(entityLocation.getPitch());
 
         gSitMain.getEntityUtil().setEntityLocation(entity, returnLocation);
         if(!gSitMain.getVersionManager().isNewerOrVersion(17, 0)) gSitMain.getEntityUtil().setEntityLocation(seat.getSeatEntity(), returnLocation);
-
-        entityBlocked.remove(entity.getUniqueId());
     }
 
     public GSeat createStairSeatForEntity(Block block, LivingEntity entity) {