Attempt at delay

Author: Waterpicker

common/src/main/java/generations/gg/generations/core/generationscore/common/world/entity/block/SittableEntity.java

@@ -7,6 +7,7 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ClientGamePacketListener;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.util.Mth;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.Entity;
@@ -15,7 +16,6 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.entity.vehicle.DismountHelper;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.NotNull;
@@ -35,28 +35,48 @@ private SittableEntity(Level level, BlockPos pos, double offset, float yaw) {
         this.setRot(yaw, 0F);
     }
 
+    private int removalDelay = 5; // Wait 5 ticks before removal
+
     @Override
-    public void tick()
-    {
+    public void tick() {
         super.tick();
-        if(!this.level().isClientSide)
-        {
-            if(this.getPassengers().isEmpty() || this.level().isEmptyBlock(this.blockPosition()))
-            {
+        if (!this.level().isClientSide) {
+            if (this.getPassengers().isEmpty()) {
+                if (removalDelay > 0) {
+                    removalDelay--; // Countdown before deletion
+                } else {
+                    this.remove(RemovalReason.DISCARDED);
+                }
+            } else {
+                removalDelay = 5; // Reset countdown if occupied
+            }
+
+            if (this.level().isEmptyBlock(this.blockPosition())) {
                 this.remove(RemovalReason.DISCARDED);
                 this.level().updateNeighbourForOutputSignal(blockPosition(), this.level().getBlockState(blockPosition()).getBlock());
             }
         }
     }
 
+//    @Override
+//    public void tick() {
+//        super.tick();
+//        if(!this.level().isClientSide) {
+//            if(this.getPassengers().isEmpty() || this.level().isEmptyBlock(this.blockPosition())) {
+//                this.remove(RemovalReason.DISCARDED);
+//                this.level().updateNeighbourForOutputSignal(blockPosition(), this.level().getBlockState(blockPosition()).getBlock());
+//            }
+//        }
+//    }
+
     @Override
     protected void defineSynchedData() {}
 
     @Override
-    protected void readAdditionalSaveData(CompoundTag compound) {}
+    protected void readAdditionalSaveData(@NotNull CompoundTag compound) {}
 
     @Override
-    protected void addAdditionalSaveData(CompoundTag compound) {}
+    protected void addAdditionalSaveData(@NotNull CompoundTag compound) {}
 
     @Override
     public double getPassengersRidingOffset()
@@ -65,22 +85,19 @@ public double getPassengersRidingOffset()
     }
 
     @Override
-    protected boolean canRide(Entity entity)
+    protected boolean canRide(@NotNull Entity entity)
     {
         return true;
     }
 
     // Call to mount the player to a newly created SittableEntity
-    public static InteractionResult mount(Level level, BlockPos pos, double yOffset, Player player, float direction)
-    {
-        if(!level.isClientSide())
-        {
+    public static InteractionResult mount(Level level, BlockPos pos, double yOffset, Player player, float direction) {
+        if(level instanceof ServerLevel serverLevel) {
             List<SittableEntity> seats = level.getEntitiesOfClass(SittableEntity.class, new AABB(pos.getX(), pos.getY(), pos.getZ(), pos.getX() + 1.0, pos.getY() + 1.0, pos.getZ() + 1.0));
-            if(seats.isEmpty())
-            {
+            if(seats.isEmpty()) {
                 SittableEntity seat = new SittableEntity(level, pos, yOffset, direction);
                 level.addFreshEntity(seat);
-                player.startRiding(seat, true);
+                player.startRiding(seat);
             }
         }
         return InteractionResult.SUCCESS;
@@ -94,43 +111,38 @@ public static InteractionResult mount(Level level, BlockPos pos, double yOffset,
 
     // Tick the key and check if the block is removed or if there are no more passengers
     @Override
-    public Vec3 getDismountLocationForPassenger(LivingEntity entity)
-    {
+    public @NotNull Vec3 getDismountLocationForPassenger(@NotNull LivingEntity entity) {
         Direction original = this.getDirection();
         Direction[] offsets = {original, original.getClockWise(), original.getCounterClockWise(), original.getOpposite()};
-        for(Direction dir : offsets)
-        {
+        for(Direction dir : offsets) {
             Vec3 safeVec = DismountHelper.findSafeDismountLocation(entity.getType(), this.level(), this.blockPosition().relative(dir), false);
             if(safeVec != null)
             {
                 return safeVec.add(0, 0.25, 0);
             }
         }
+
         return super.getDismountLocationForPassenger(entity);
     }
 
     @Override
-    protected void addPassenger(Entity entity)
-    {
+    protected void addPassenger(@NotNull Entity entity) {
         super.addPassenger(entity);
         entity.setYRot(this.getYRot());
     }
 
     @Override
-    public void positionRider(Entity entity, Entity.MoveFunction function)
-    {
+    public void positionRider(@NotNull Entity entity, Entity.@NotNull MoveFunction function) {
         super.positionRider(entity, function);
         this.clampYaw(entity);
     }
 
     @Override
-    public void onPassengerTurned(Entity entity)
-    {
+    public void onPassengerTurned(@NotNull Entity entity) {
         this.clampYaw(entity);
     }
 
-    private void clampYaw(Entity passenger)
-    {
+    private void clampYaw(Entity passenger) {
         passenger.setYBodyRot(this.getYRot());
         float wrappedYaw = Mth.wrapDegrees(passenger.getYRot() - this.getYRot());
         float clampedYaw = Mth.clamp(wrappedYaw, -120.0F, 120.0F);