191 lines
11 KiB
Diff
191 lines
11 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: MrHua269 <wangxyper@163.com>
|
|
Date: Fri, 31 Jan 2025 20:28:45 +0800
|
|
Subject: [PATCH] Add missing teleportation apis for folia
|
|
|
|
|
|
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
|
|
index 9fd3fe181df2ce6dbe695f6463d3940ac4c01167..822d401150d3764004b2570da828b4f69f19dcec 100644
|
|
--- a/net/minecraft/server/level/ServerPlayer.java
|
|
+++ b/net/minecraft/server/level/ServerPlayer.java
|
|
@@ -1653,6 +1653,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
|
|
if (respawnComplete != null) {
|
|
respawnComplete.accept(ServerPlayer.this);
|
|
}
|
|
+ // Luminol - Add missing teleportation apis
|
|
+ new me.earthme.luminol.api.entity.player.PostPlayerRespawnEvent(ServerPlayer.this.getBukkitEntity()).callEvent();
|
|
+ // Luminol end
|
|
}
|
|
);
|
|
});
|
|
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
|
|
index 406c382ae2fdaa7d8996d250487bbdfb7e4bb7f9..e41aef2b9e7204b35202d66eb17985e3731d9611 100644
|
|
--- a/net/minecraft/world/entity/Entity.java
|
|
+++ b/net/minecraft/world/entity/Entity.java
|
|
@@ -4164,6 +4164,35 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
|
}
|
|
|
|
// TODO any events that can modify go HERE
|
|
+ // Luminol start - Add missing teleportation apis
|
|
+ org.bukkit.Location destinationLoc;
|
|
+
|
|
+ if (pitch == null) {
|
|
+ if (yaw == null) {
|
|
+ destinationLoc = io.papermc.paper.util.MCUtil.toLocation(destination, pos, Float.NaN, Float.NaN);
|
|
+ } else {
|
|
+ destinationLoc = io.papermc.paper.util.MCUtil.toLocation(destination, pos, yaw, Float.NaN);
|
|
+ }
|
|
+ }else {
|
|
+ if (yaw == null) {
|
|
+ destinationLoc = io.papermc.paper.util.MCUtil.toLocation(destination, pos, Float.NaN, pitch);
|
|
+ }else {
|
|
+ destinationLoc = io.papermc.paper.util.MCUtil.toLocation(destination, pos, yaw, pitch);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ final me.earthme.luminol.api.entity.EntityTeleportAsyncEvent wrapped = new me.earthme.luminol.api.entity.EntityTeleportAsyncEvent(
|
|
+ this.getBukkitEntity(),
|
|
+ cause,
|
|
+ destinationLoc
|
|
+ );
|
|
+ if (!wrapped.callEvent()) {
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ destination = ((org.bukkit.craftbukkit.CraftWorld) wrapped.getDestination().getWorld()).getHandle();
|
|
+ pos = io.papermc.paper.util.MCUtil.toVec3(wrapped.getDestination());
|
|
+ // Luminol end
|
|
|
|
// check for same region
|
|
if (destination == this.level()) {
|
|
@@ -4280,7 +4309,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
|
// we just select the spawn position
|
|
case END: {
|
|
if (destination.getTypeKey() == net.minecraft.world.level.dimension.LevelStem.END) {
|
|
- BlockPos targetPos = ServerLevel.END_SPAWN_POINT;
|
|
+ BlockPos targetPos1 = ServerLevel.END_SPAWN_POINT; // Luminol - Rename
|
|
+ // Luminol start - Add missing teleportation apis
|
|
+ final org.bukkit.Location orginalPortalLocation = io.papermc.paper.util.MCUtil.toLocation(origin, originPortal);
|
|
+ final org.bukkit.Location targetPortalLocation = io.papermc.paper.util.MCUtil.toLocation(destination, targetPos1);
|
|
+
|
|
+ final me.earthme.luminol.api.portal.PortalLocateEvent portalLocateEvent = new me.earthme.luminol.api.portal.PortalLocateEvent(
|
|
+ orginalPortalLocation,
|
|
+ targetPortalLocation
|
|
+ );
|
|
+
|
|
+ portalLocateEvent.callEvent();
|
|
+
|
|
+ final BlockPos targetPos = io.papermc.paper.util.MCUtil.toBlockPosition(portalLocateEvent.getDestination()); // Swap value
|
|
+ // Luminol end
|
|
// need to load chunks so we can create the platform
|
|
destination.moonrise$loadChunksAsync(
|
|
targetPos, 16, // load 16 blocks to be safe from block physics
|
|
@@ -4305,7 +4347,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
|
}
|
|
);
|
|
} else {
|
|
- BlockPos spawnPos = destination.getSharedSpawnPos();
|
|
+ BlockPos spawnPos1 = destination.getSharedSpawnPos(); // Luminol - Rename
|
|
+ // Luminol start - Add missing teleportation apis
|
|
+ final org.bukkit.Location orginalPortalLocation = io.papermc.paper.util.MCUtil.toLocation(origin, originPortal);
|
|
+ final org.bukkit.Location targetPortalLocation = io.papermc.paper.util.MCUtil.toLocation(destination, spawnPos1);
|
|
+
|
|
+ final me.earthme.luminol.api.portal.PortalLocateEvent portalLocateEvent = new me.earthme.luminol.api.portal.PortalLocateEvent(
|
|
+ orginalPortalLocation,
|
|
+ targetPortalLocation
|
|
+ );
|
|
+
|
|
+ portalLocateEvent.callEvent();
|
|
+
|
|
+ final BlockPos spawnPos = io.papermc.paper.util.MCUtil.toBlockPosition(portalLocateEvent.getDestination()); // Swap value
|
|
+ // Luminol end
|
|
// need to load chunk for heightmap
|
|
destination.moonrise$loadChunksAsync(
|
|
spawnPos, 0,
|
|
@@ -4355,8 +4410,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
|
|
|
WorldBorder destinationBorder = destination.getWorldBorder();
|
|
double dimensionScale = net.minecraft.world.level.dimension.DimensionType.getTeleportationScale(origin.dimensionType(), destination.dimensionType());
|
|
- BlockPos targetPos = destination.getWorldBorder().clampToBounds(this.getX() * dimensionScale, this.getY(), this.getZ() * dimensionScale);
|
|
+ BlockPos targetPos1 = destination.getWorldBorder().clampToBounds(this.getX() * dimensionScale, this.getY(), this.getZ() * dimensionScale); // Luminol - Rename
|
|
+ // Luminol start - Add missing teleportation apis
|
|
+ final org.bukkit.Location orginalPortalLocation = io.papermc.paper.util.MCUtil.toLocation(origin, originPortal);
|
|
+ final org.bukkit.Location targetPortalLocation = io.papermc.paper.util.MCUtil.toLocation(destination, targetPos1);
|
|
+
|
|
+ final me.earthme.luminol.api.portal.PortalLocateEvent portalLocateEvent = new me.earthme.luminol.api.portal.PortalLocateEvent(
|
|
+ orginalPortalLocation,
|
|
+ targetPortalLocation
|
|
+ );
|
|
+
|
|
+ portalLocateEvent.callEvent();
|
|
|
|
+ final BlockPos targetPos = io.papermc.paper.util.MCUtil.toBlockPosition(portalLocateEvent.getDestination()); // Swap value
|
|
+ // Luminol end
|
|
ca.spottedleaf.concurrentutil.completable.CallbackCompletable<BlockUtil.FoundRectangle> portalFound
|
|
= new ca.spottedleaf.concurrentutil.completable.CallbackCompletable<>();
|
|
|
|
@@ -4493,9 +4560,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
|
if (!this.canPortalAsync(destination, takePassengers)) {
|
|
return false;
|
|
}
|
|
+ // Luminol start - Add missing teleportation events
|
|
+ if (!new me.earthme.luminol.api.entity.PreEntityPortalEvent(
|
|
+ this.getBukkitEntity(),
|
|
+ io.papermc.paper.util.MCUtil.toLocation(this.level, portalPos),
|
|
+ destination.getWorld()
|
|
+ ).callEvent()) {
|
|
+ return false;
|
|
+ }
|
|
+ // Luminol end
|
|
// Kaiiju start - sync end platform spawning & entity teleportation
|
|
final java.util.function.Consumer<Entity> tpComplete = type == PortalType.END && destination.getTypeKey() == LevelStem.END ?
|
|
- e -> net.minecraft.world.level.levelgen.feature.EndPlatformFeature.createEndPlatform(destination, ServerLevel.END_SPAWN_POINT.below(), true, null) : teleportComplete;
|
|
+ e -> { if (new me.earthme.luminol.api.portal.EndPlatformCreateEvent().callEvent() && ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(e.level, ServerLevel.END_SPAWN_POINT.below())) net.minecraft.world.level.levelgen.feature.EndPlatformFeature.createEndPlatform(destination, ServerLevel.END_SPAWN_POINT.below(), true, null); } : teleportComplete; // Luminol - Add missing teleportation events & Fix teleportation api threading issue
|
|
// Kaiiju end
|
|
|
|
Vec3 initialPosition = this.position();
|
|
@@ -4569,6 +4645,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
|
tpComplete.accept(teleported);
|
|
}
|
|
// Kaiiju end
|
|
+ // Luminol start - Add missing teleportation events
|
|
+ new me.earthme.luminol.api.entity.PostEntityPortalEvent(teleported.getBukkitEntity()).callEvent();
|
|
+ // Luminol end
|
|
}
|
|
);
|
|
});
|
|
diff --git a/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
|
|
index 61887e6b052bca715c90dff5d9cd657e0b3f6a78..d56cfb7357a88844428c1f84efdb72d0b2e63b3f 100644
|
|
--- a/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
|
|
+++ b/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
|
|
@@ -186,13 +186,27 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
|
|
}
|
|
|
|
// First, find the position we are trying to teleport to
|
|
- BlockPos teleportPos = portalTile.exitPortal;
|
|
+ BlockPos teleportPos2 = portalTile.exitPortal;
|
|
boolean isExactTeleport = portalTile.exactTeleport;
|
|
|
|
- if (teleportPos == null) {
|
|
+ if (teleportPos2 == null) {
|
|
portalTile.trySearchForExit(portalWorld, portalPos);
|
|
return false;
|
|
}
|
|
+ // Luminol start - Add missing teleportation apis
|
|
+ final org.bukkit.Location orginalPortalLocation = io.papermc.paper.util.MCUtil.toLocation(toTeleport.level(), portalPos);
|
|
+ final org.bukkit.Location targetPortalLocation = io.papermc.paper.util.MCUtil.toLocation(portalWorld, teleportPos2);
|
|
+
|
|
+ final me.earthme.luminol.api.portal.PortalLocateEvent portalLocateEvent = new me.earthme.luminol.api.portal.PortalLocateEvent(
|
|
+ orginalPortalLocation,
|
|
+ targetPortalLocation
|
|
+ );
|
|
+
|
|
+ portalLocateEvent.callEvent();
|
|
+
|
|
+ final BlockPos teleportPos = io.papermc.paper.util.MCUtil.toBlockPosition(portalLocateEvent.getDestination()); // Swap value
|
|
+ // Luminol end
|
|
+
|
|
|
|
// note: we handle the position from the TeleportTransition
|
|
net.minecraft.world.level.portal.TeleportTransition teleport = net.minecraft.world.level.block.EndGatewayBlock.getTeleportTransition(
|