NanaChiyo0721/Shiroha
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix patch conflict

Browse Source
This commit is contained in:
NanaChiyo0721
2026-07-27 20:47:44 +08:00
parent 10cc76bbff
commit 484990074d
20 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shiroha-server/minecraft-patches/features/0030-Kaiiju-Vanilla-end-portal-teleportation.patch
+17 -13
View File
@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: MrHua269 <mrhua269@gmail.com>
Date: Wed, 8 Jul 2026 22:35:59 +0800
From: NanaChiyo0721 <nanachiyo0721@163.com>
Date: Mon, 27 Jul 2026 20:43:17 +0800
Subject: [PATCH] Kaiiju: Vanilla end portal teleportation
Co-authored by: Sofiane H. Djerbi <46628754+kugge@users.noreply.github.com>
@@ -8,10 +8,10 @@ As part of: Kaiiju (https://github.com/KaiijuMC/Kaiiju/blob/c2b7aec8f7b418a39a2e
Licensed under: GPL-3.0 (https://github.com/KaiijuMC/Kaiiju/blob/c2b7aec8f7b418a39a2ec408e6411e6f752379da/LICENSE)
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
index 375d4a504cd3f2f2495315cc7456dd245e9d2547..319997dca2b461b41b02ca2d9b0e3ed9fd05ac88 100644
index 4a5266e3e15e765dda4b2aac54bf0eb90291b096..bf5b6922fbe7d631c429d337001a4d2cd919fbe3 100644
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -4640,14 +4640,18 @@ public abstract class Entity
@@ -4640,15 +4640,19 @@ public abstract class Entity
targetPos, 16, // load 16 blocks to be safe from block physics
ca.spottedleaf.concurrentutil.util.Priority.HIGH,
(chunks) -> {
@@ -28,13 +28,14 @@ index 375d4a504cd3f2f2495315cc7456dd245e9d2547..319997dca2b461b41b02ca2d9b0e3ed9
portalInfoCompletable.complete(
new net.minecraft.world.level.portal.TeleportTransition(
- destination, Vec3.atBottomCenterOf(targetPos.below()), Vec3.ZERO, Direction.WEST.toYRot(), 0.0f,
- Relative.union(Relative.DELTA, Set.of(Relative.X_ROT)),
+ destination, finalPos, this.getDeltaMovement(), Direction.WEST.toYRot(), 0.0f, // Kaiiju - Vanilla end teleportation
+ /*Relative.union(Relative.DELTA, Set.of(Relative.X_ROT))*/Set.of(), // Kaiiju - Vanilla end teleportation
false, false,
- Relative.union(Relative.DELTA, Set.of(Relative.X_ROT)),
+ java.util.Collections.EMPTY_SET, // Kaiiju - Vanilla end teleportation
TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET),
org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL
)
@@ -4662,11 +4666,15 @@ public abstract class Entity
org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL,
TeleportTransition.PassengerTeleportationMode.POSITION_RIDER
@@ -4664,13 +4668,17 @@ public abstract class Entity
ca.spottedleaf.concurrentutil.util.Priority.HIGH,
(chunks) -> {
BlockPos adjustedSpawn = destination.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, spawnPos);
@@ -49,10 +50,13 @@ index 375d4a504cd3f2f2495315cc7456dd245e9d2547..319997dca2b461b41b02ca2d9b0e3ed9
new net.minecraft.world.level.portal.TeleportTransition(
- destination, Vec3.atBottomCenterOf(adjustedSpawn), Vec3.ZERO, 0.0f, 0.0f,
+ destination, finalPos, this.getDeltaMovement(), 0.0f, 0.0f, // Kaiiju - Vanilla end teleportation
Relative.union(Relative.DELTA, Relative.ROTATION),
false, false,
- Relative.union(Relative.DELTA, Relative.ROTATION),
+ java.util.Collections.EMPTY_SET, // Kaiiju - Vanilla end teleportation
TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET),
org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL
@@ -4845,6 +4853,10 @@ public abstract class Entity
org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL,
TeleportTransition.PassengerTeleportationMode.POSITION_RIDER
@@ -4849,6 +4857,10 @@ public abstract class Entity
return false;
}
@@ -63,7 +67,7 @@ index 375d4a504cd3f2f2495315cc7456dd245e9d2547..319997dca2b461b41b02ca2d9b0e3ed9
Vec3 initialPosition = this.position();
ChunkPos initialPositionChunk = new ChunkPos(
ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkX(initialPosition),
@@ -4908,9 +4920,14 @@ public abstract class Entity
@@ -4912,9 +4924,14 @@ public abstract class Entity
info.postTeleportTransition().onTransition(teleported);
}