Test task dismount behavior

Author: gecolay

core/src/main/java/dev/geco/gsit/event/PlayerEventHandler.java

@@ -11,6 +11,7 @@
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
@@ -46,6 +47,9 @@ public void playerQuitEvent(PlayerQuitEvent event) {
     @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
     public void playerTeleportEvent(PlayerTeleportEvent event) { stopActions(event.getPlayer(), GStopReason.TELEPORT, false); }
 
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void playerDeathEvent(PlayerDeathEvent event) { stopActions(event.getPlayer(), GStopReason.DEATH, false); }
+
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void entityDamageEvent(EntityDamageEvent event) {
         Entity entity = event.getEntity();

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

@@ -147,13 +147,16 @@ public void handleSafeSeatDismount(GSeat seat) {
         Location upLocation = seat.getLocation().add(0d, baseOffset + (Tag.STAIRS.isTagged(blockType) ? STAIR_Y_OFFSET : 0d) - gSitMain.getConfigService().S_SITMATERIALS.getOrDefault(blockType, 0d), 0d);
 
         Location returnLocation = gSitMain.getConfigService().GET_UP_RETURN ? seat.getReturnLocation() : upLocation;
-        Location entityLocation = entity.getLocation();
 
-        returnLocation.setYaw(entityLocation.getYaw());
-        returnLocation.setPitch(entityLocation.getPitch());
+        gSitMain.getTaskService().runDelayed(() -> {
+            Location entityLocation = entity.getLocation();
 
-        if(seat.getSeatEntity().isValid()) gSitMain.getEntityUtil().setEntityLocation(seat.getSeatEntity(), returnLocation);
-        if(entity.isValid()) gSitMain.getEntityUtil().setEntityLocation(entity, returnLocation);
+            returnLocation.setYaw(entityLocation.getYaw());
+            returnLocation.setPitch(entityLocation.getPitch());
+
+            if(seat.getSeatEntity().isValid()) gSitMain.getEntityUtil().setEntityLocation(seat.getSeatEntity(), returnLocation);
+            if(entity.isValid()) gSitMain.getEntityUtil().setEntityLocation(entity, returnLocation);
+        }, 0);
     }
 
     public GSeat createStairSeatForEntity(Block block, LivingEntity entity) {