Tidy patches

Command IllegalArgumentException crash fix

luminol-server/minecraft-patches/features/0025-Command-IllegalArgumentException-crash-fix.patch

@@ -0,0 +1,52 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Thu, 24 Apr 2025 20:59:52 +0800
+Subject: [PATCH] Command IllegalArgumentException crash fix
+
+
+diff --git a/net/minecraft/server/commands/FillCommand.java b/net/minecraft/server/commands/FillCommand.java
+index 89154adfc659afa188cd771e70087e3b1a9c98b9..e622f96e6e116bf491bbea39da099e02ceaee502 100644
+--- a/net/minecraft/server/commands/FillCommand.java
++++ b/net/minecraft/server/commands/FillCommand.java
+@@ -210,6 +210,10 @@ public class FillCommand {
+             // Folia start - region threading
+                 } catch (CommandSyntaxException ex) {
+                     sendMessage(source, ex);
++                // Luminol Start - Server crash fix
++                } catch (IllegalArgumentException ex) {
++                    net.minecraft.server.commands.SetBlockCommand.processIAE(source, ex);
++                // Luminol End - Server crash fix
+                 }
+             }); return 0; // Folia end - region threading
+         }
+diff --git a/net/minecraft/server/commands/SetBlockCommand.java b/net/minecraft/server/commands/SetBlockCommand.java
+index 05b824409546ba8bacf7efdaeac106af89ff0715..55911d49c7650b344b46b2cfa9c4ae840ae433c8 100644
+--- a/net/minecraft/server/commands/SetBlockCommand.java
++++ b/net/minecraft/server/commands/SetBlockCommand.java
+@@ -86,6 +86,15 @@ public class SetBlockCommand {
+     }
+     // Folia end - region threading
+ 
++    // Luminol Start - Server crash fix
++    public static void processIAE(CommandSourceStack src, IllegalArgumentException ex) {
++        Component hoverText = Component.translatable("command.failed")
++                .withStyle(style -> style.withHoverEvent(new net.minecraft.network.chat.HoverEvent(net.minecraft.network.chat.HoverEvent.Action.SHOW_TEXT, Component.literal(ex.getMessage()))));
++        src.sendFailure(hoverText);
++        com.mojang.logging.LogUtils.getLogger().error(ex.getMessage(), ex);
++    }
++    // Luminol end - Server crash fix
++
+     private static int setBlock(
+         CommandSourceStack source, BlockPos pos, BlockInput state, SetBlockCommand.Mode mode, @Nullable Predicate<BlockInWorld> predicate
+     ) throws CommandSyntaxException {
+@@ -119,6 +128,10 @@ public class SetBlockCommand {
+         // Folia start - region threading
+                 } catch (CommandSyntaxException ex) {
+                     sendMessage(source, ex);
++                // Luminol Start - Server crash fix
++                } catch (IllegalArgumentException ex) {
++                    processIAE(source, ex);
++                // Luminol End - Server crash fix
+                 }
+             });
+         return 1;

luminol-server/minecraft-patches/features/0056-Add-afterPortalLogic-to-process-some-logics.patch

@@ -1,47 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Sun, 27 Apr 2025 14:26:01 +0800
-Subject: [PATCH] Add afterPortalLogic to process some logics
-
-
-diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 4a0d07a3263704a7c6e6859ddcbe767c202ed794..dc0a9f39751173824d8cef569f94b459ee6e94dc 100644
---- a/net/minecraft/world/entity/Entity.java
-+++ b/net/minecraft/world/entity/Entity.java
-@@ -4557,6 +4557,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
- 
-     }
- 
-+    // Luminol start - Add afterPortalLogic
-+    protected void afterPortalLogic() {
-+
-+    }
-+    // Luminol end - Add afterPortalLogic
-+
-     protected boolean portalToAsync(ServerLevel destination, BlockPos portalPos, boolean takePassengers,
-                                     PortalType type, java.util.function.Consumer<Entity> teleportComplete) {
-         ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread(this, "Cannot portal entity async");
-@@ -4640,6 +4646,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-                         info.postTeleportTransition().onTransition(teleported);
-                     }
- 
-+                    teleported.afterPortalLogic(); // Luminol - Add afterPortalLogic
-+
-                     // Kaiiju start - vanilla end teleportation
-                     /*if (teleportComplete != null) {
-                         teleportComplete.accept(teleported);
-diff --git a/net/minecraft/world/entity/item/PrimedTnt.java b/net/minecraft/world/entity/item/PrimedTnt.java
-index 88570bb4aa02896545805d7721c45cf9599befea..bbf9748a36404139356db606dbb3b0cc13c66b50 100644
---- a/net/minecraft/world/entity/item/PrimedTnt.java
-+++ b/net/minecraft/world/entity/item/PrimedTnt.java
-@@ -251,4 +251,10 @@ public class PrimedTnt extends Entity implements TraceableEntity {
-         return !this.level().paperConfig().fixes.preventTntFromMovingInWater && super.isPushedByFluid();
-     }
-     // Paper end - Option to prevent TNT from moving in water
-+
-+    // Luminol start - Add afterPortalLogic
-+    protected void afterPortalLogic() {
-+        this.setUsedPortal(true);
-+    }
-+    // Luminol start - Add afterPortalLogic
- }

luminol-server/minecraft-patches/features/0056-Fix-off-tickregion-sync-teleport.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix off tickregion sync teleport
 
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index ceca76a5791e319dd7cc4048c9860b1df065b95a..4a0d07a3263704a7c6e6859ddcbe767c202ed794 100644
+index ceca76a5791e319dd7cc4048c9860b1df065b95a..fc7da66320bfd8701b754e607ad18370f460fd4d 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -4067,6 +4067,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -28,11 +28,8 @@ index ceca76a5791e319dd7cc4048c9860b1df065b95a..4a0d07a3263704a7c6e6859ddcbe767c
      protected final void transform(TeleportTransition telpeort) {
          PositionMoveRotation move = PositionMoveRotation.calculateAbsolute(
              PositionMoveRotation.of(this), PositionMoveRotation.of(telpeort), telpeort.relatives()
-@@ -4186,10 +4199,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-         wrapped.callEvent();
-         // Luminol end
- 
--        // check for same region
+@@ -4189,7 +4202,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+         // check for same region
          if (destination == this.level()) {
              Vec3 currPos = this.position();
 -            if (

luminol-server/minecraft-patches/features/0057-Entity-portal-teleport-speed-fix.patch

@@ -1,56 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Mon, 28 Apr 2025 11:53:13 +0800
-Subject: [PATCH] Entity portal-teleport speed fix
-
-
-diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index dc0a9f39751173824d8cef569f94b459ee6e94dc..a4e5c5675dc09f598a6ae05d7aea21b48e451b21 100644
---- a/net/minecraft/world/entity/Entity.java
-+++ b/net/minecraft/world/entity/Entity.java
-@@ -3304,7 +3304,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-             this.setPortalCooldown();
-         } else {
-             if (this.portalProcess == null || !this.portalProcess.isSamePortal(portal)) {
--                this.portalProcess = new PortalProcessor(portal, pos.immutable());
-+                this.portalProcess = new PortalProcessor(portal, pos.immutable(), this.getDeltaMovement()); // Luminol - Entity portal-teleport speed fix
-             } else if (!this.portalProcess.isInsidePortalThisTick()) {
-                 this.portalProcess.updateEntryPosition(pos.immutable());
-                 this.portalProcess.setAsInsidePortalThisTick(true);
-diff --git a/net/minecraft/world/entity/PortalProcessor.java b/net/minecraft/world/entity/PortalProcessor.java
-index 46d989aef0eceebd98bfd93999153319de77a8a0..6e9171fa0c636439bd96401ea9e5fe80ffdc8bdd 100644
---- a/net/minecraft/world/entity/PortalProcessor.java
-+++ b/net/minecraft/world/entity/PortalProcessor.java
-@@ -9,12 +9,14 @@ import net.minecraft.world.level.portal.TeleportTransition;
- public class PortalProcessor {
-     private final Portal portal;
-     private BlockPos entryPosition;
-+    private net.minecraft.world.phys.Vec3 speedVec3; // Luminol - Entity portal-teleport speed fix
-     private int portalTime;
-     private boolean insidePortalThisTick;
- 
--    public PortalProcessor(Portal portal, BlockPos entryPosition) {
-+    public PortalProcessor(Portal portal, BlockPos entryPosition, net.minecraft.world.phys.Vec3 speedVec3) { // Luminol - Entity portal-teleport speed fix
-         this.portal = portal;
-         this.entryPosition = entryPosition;
-+        this.speedVec3 = speedVec3; // Luminol - Entity portal-teleport speed fix
-         this.insidePortalThisTick = true;
-     }
- 
-@@ -35,7 +37,15 @@ public class PortalProcessor {
- 
-     // Folia start - region threading
-     public boolean portalAsync(ServerLevel sourceWorld, Entity portalTarget) {
--        return this.portal.portalAsync(sourceWorld, portalTarget, this.entryPosition);
-+        // Luminol start - Entity portal-teleport speed fix
-+        net.minecraft.world.phys.Vec3 oldSpeed = portalTarget.getDeltaMovement();
-+        portalTarget.setDeltaMovement(this.speedVec3);
-+        boolean flag = this.portal.portalAsync(sourceWorld, portalTarget, this.entryPosition);
-+        if (!flag) {
-+            portalTarget.setDeltaMovement(oldSpeed);
-+        }
-+        return flag;
-+        // Luminol end - Entity portal-teleport speed fix
-     }
-     // Folia end - region threading
- 

luminol-server/minecraft-patches/features/0057-Portal-Behavior-Modifiers.patch

@@ -0,0 +1,127 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Sun, 27 Apr 2025 14:26:01 +0800
+Subject: [PATCH] Portal Behavior Modifiers
+
+
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
+index fc7da66320bfd8701b754e607ad18370f460fd4d..ddea23366c290ce44cc0c6764dffba5aeb63772a 100644
+--- a/net/minecraft/world/entity/Entity.java
++++ b/net/minecraft/world/entity/Entity.java
+@@ -3304,7 +3304,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+             this.setPortalCooldown();
+         } else {
+             if (this.portalProcess == null || !this.portalProcess.isSamePortal(portal)) {
+-                this.portalProcess = new PortalProcessor(portal, pos.immutable());
++                this.portalProcess = new PortalProcessor(portal, pos.immutable(), this.getDeltaMovement()); // Luminol - Entity portal-teleport speed fix
+             } else if (!this.portalProcess.isInsidePortalThisTick()) {
+                 this.portalProcess.updateEntryPosition(pos.immutable());
+                 this.portalProcess.setAsInsidePortalThisTick(true);
+@@ -3829,20 +3829,27 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+ 
+             EntityTreeNode curr;
+             while ((curr = queue.pollFirst()) != null) {
+-                EntityTreeNode[] passengers = curr.passengers;
++                restore(curr); // Luminol - EndGateway Portal Passengers Fix
++            }
++        }
++
++        // Luminol Start - EndGateway Portal Passengers Fix
++        private EntityTreeNode[] restore(EntityTreeNode entity) {
++                EntityTreeNode[] passengers = entity.passengers;
+                 if (passengers == null) {
+-                    continue;
++                    return null;
+                 }
+ 
+                 List<Entity> newPassengers = new java.util.ArrayList<>();
+                 for (EntityTreeNode passenger : passengers) {
++                    passenger.passengers = restore(passenger);
+                     newPassengers.add(passenger.root);
+-                    passenger.root.vehicle = curr.root;
++                    passenger.root.vehicle = entity.root;
+                 }
+-
+-                curr.root.passengers = ImmutableList.copyOf(newPassengers);
+-            }
++                entity.root.passengers = ImmutableList.copyOf(newPassengers);
++                return passengers;
+         }
++        // Luminol End - EndGateway Portal Passengers Fix
+ 
+         public void addTracker() {
+             for (final EntityTreeNode node : this.getFullTree()) {
+@@ -4558,6 +4565,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+ 
+     }
+ 
++    // Luminol start - Add afterPortalLogic
++    protected void afterPortalLogic() {
++
++    }
++    // Luminol end - Add afterPortalLogic
++
+     protected boolean portalToAsync(ServerLevel destination, BlockPos portalPos, boolean takePassengers,
+                                     PortalType type, java.util.function.Consumer<Entity> teleportComplete) {
+         ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread(this, "Cannot portal entity async");
+@@ -4641,6 +4654,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+                         info.postTeleportTransition().onTransition(teleported);
+                     }
+ 
++                    teleported.afterPortalLogic(); // Luminol - Add afterPortalLogic
++
+                     // Kaiiju start - vanilla end teleportation
+                     /*if (teleportComplete != null) {
+                         teleportComplete.accept(teleported);
+diff --git a/net/minecraft/world/entity/PortalProcessor.java b/net/minecraft/world/entity/PortalProcessor.java
+index 46d989aef0eceebd98bfd93999153319de77a8a0..6e9171fa0c636439bd96401ea9e5fe80ffdc8bdd 100644
+--- a/net/minecraft/world/entity/PortalProcessor.java
++++ b/net/minecraft/world/entity/PortalProcessor.java
+@@ -9,12 +9,14 @@ import net.minecraft.world.level.portal.TeleportTransition;
+ public class PortalProcessor {
+     private final Portal portal;
+     private BlockPos entryPosition;
++    private net.minecraft.world.phys.Vec3 speedVec3; // Luminol - Entity portal-teleport speed fix
+     private int portalTime;
+     private boolean insidePortalThisTick;
+ 
+-    public PortalProcessor(Portal portal, BlockPos entryPosition) {
++    public PortalProcessor(Portal portal, BlockPos entryPosition, net.minecraft.world.phys.Vec3 speedVec3) { // Luminol - Entity portal-teleport speed fix
+         this.portal = portal;
+         this.entryPosition = entryPosition;
++        this.speedVec3 = speedVec3; // Luminol - Entity portal-teleport speed fix
+         this.insidePortalThisTick = true;
+     }
+ 
+@@ -35,7 +37,15 @@ public class PortalProcessor {
+ 
+     // Folia start - region threading
+     public boolean portalAsync(ServerLevel sourceWorld, Entity portalTarget) {
+-        return this.portal.portalAsync(sourceWorld, portalTarget, this.entryPosition);
++        // Luminol start - Entity portal-teleport speed fix
++        net.minecraft.world.phys.Vec3 oldSpeed = portalTarget.getDeltaMovement();
++        portalTarget.setDeltaMovement(this.speedVec3);
++        boolean flag = this.portal.portalAsync(sourceWorld, portalTarget, this.entryPosition);
++        if (!flag) {
++            portalTarget.setDeltaMovement(oldSpeed);
++        }
++        return flag;
++        // Luminol end - Entity portal-teleport speed fix
+     }
+     // Folia end - region threading
+ 
+diff --git a/net/minecraft/world/entity/item/PrimedTnt.java b/net/minecraft/world/entity/item/PrimedTnt.java
+index 88570bb4aa02896545805d7721c45cf9599befea..bbf9748a36404139356db606dbb3b0cc13c66b50 100644
+--- a/net/minecraft/world/entity/item/PrimedTnt.java
++++ b/net/minecraft/world/entity/item/PrimedTnt.java
+@@ -251,4 +251,10 @@ public class PrimedTnt extends Entity implements TraceableEntity {
+         return !this.level().paperConfig().fixes.preventTntFromMovingInWater && super.isPushedByFluid();
+     }
+     // Paper end - Option to prevent TNT from moving in water
++
++    // Luminol start - Add afterPortalLogic
++    protected void afterPortalLogic() {
++        this.setUsedPortal(true);
++    }
++    // Luminol start - Add afterPortalLogic
+ }