diff --git a/.github/workflows/build_1.21.4.yml b/.github/workflows/build_1.21.4.yml index 8581728..8c9fc94 100644 --- a/.github/workflows/build_1.21.4.yml +++ b/.github/workflows/build_1.21.4.yml @@ -41,7 +41,7 @@ jobs: uses: "actions/upload-artifact@v4" with: name: "${{ env.project_id_b }} CI Artifacts" - path: "luminol-server/build/libs/*-paperclip.jar" + path: "luminol-server/build/libs/*-paperclip-*-mojmap.jar" - name: SetENV if: github.event_name != 'pull_request' run: sh scripts/SetENV.sh diff --git a/luminol-server/minecraft-patches/features/0055-Add-afterPortalLogic-to-process-some-logics.patch b/luminol-server/minecraft-patches/features/0055-Add-afterPortalLogic-to-process-some-logics.patch new file mode 100644 index 0000000..d932874 --- /dev/null +++ b/luminol-server/minecraft-patches/features/0055-Add-afterPortalLogic-to-process-some-logics.patch @@ -0,0 +1,47 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Helvetica Volubi +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 ceca76a5791e319dd7cc4048c9860b1df065b95a..065e74d29eee35e07a0d5db8850dc6f93a9729c0 100644 +--- a/net/minecraft/world/entity/Entity.java ++++ b/net/minecraft/world/entity/Entity.java +@@ -4545,6 +4545,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 teleportComplete) { + ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread(this, "Cannot portal entity async"); +@@ -4628,6 +4634,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 + }