2024-06-14 02:08:12 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
Date: Sun, 16 May 2021 09:39:46 -0700
|
|
|
|
Subject: [PATCH] Add back EntityPortalExitEvent
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
2024-10-25 12:30:19 +02:00
|
|
|
index 674df993333ddee13415a4379b81dadc68489af7..cb6a167ed778073be9f9e1f2eb27b46547b0a3ce 100644
|
2024-06-14 02:08:12 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
2024-10-23 21:43:06 +02:00
|
|
|
@@ -3491,7 +3491,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
2024-06-14 02:08:12 +02:00
|
|
|
if (!this.isRemoved()) {
|
|
|
|
// CraftBukkit start
|
2024-10-23 21:43:06 +02:00
|
|
|
PositionMoveRotation absolutePosition = PositionMoveRotation.calculateAbsolute(PositionMoveRotation.of(this), PositionMoveRotation.of(teleportTarget), teleportTarget.relatives());
|
|
|
|
- Location to = CraftLocation.toBukkit(absolutePosition.position(), teleportTarget.newLevel().getWorld(), absolutePosition.yRot(), absolutePosition.xRot());
|
|
|
|
+ Location to = CraftLocation.toBukkit(absolutePosition.position(), teleportTarget.newLevel().getWorld(), absolutePosition.yRot(), this.getXRot()); // Paper - use getXRot (doesn't respect DimensionTransition pitch) // Why?
|
2024-06-14 02:08:12 +02:00
|
|
|
// Paper start - gateway-specific teleport event
|
|
|
|
final EntityTeleportEvent teleEvent;
|
|
|
|
if (this.portalProcess != null && this.portalProcess.isSamePortal(((net.minecraft.world.level.block.EndGatewayBlock) net.minecraft.world.level.block.Blocks.END_GATEWAY)) && this.level.getBlockEntity(this.portalProcess.getEntryPosition()) instanceof net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity theEndGatewayBlockEntity) {
|
2024-10-23 21:43:06 +02:00
|
|
|
@@ -3508,6 +3508,27 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
|
|
|
to = teleEvent.getTo();
|
|
|
|
teleportTarget = new TeleportTransition(((CraftWorld) to.getWorld()).getHandle(), CraftLocation.toVec3D(to), Vec3.ZERO, to.getYaw(), to.getPitch(), teleportTarget.missingRespawnBlock(), teleportTarget.asPassenger(), Set.of(), teleportTarget.postTeleportTransition(), teleportTarget.cause());
|
2024-06-14 02:08:12 +02:00
|
|
|
}
|
|
|
|
+ // Paper start - Call EntityPortalExitEvent
|
2024-09-22 23:35:04 +02:00
|
|
|
+ if (this.portalProcess != null) { // if in a portal
|
|
|
|
+ CraftEntity bukkitEntity = this.getBukkitEntity();
|
2024-10-23 21:43:06 +02:00
|
|
|
+ Vec3 velocity = teleportTarget.deltaMovement();
|
2024-09-22 23:35:04 +02:00
|
|
|
+ org.bukkit.event.entity.EntityPortalExitEvent event = new org.bukkit.event.entity.EntityPortalExitEvent(
|
|
|
|
+ bukkitEntity,
|
|
|
|
+ bukkitEntity.getLocation(), to.clone(),
|
|
|
|
+ bukkitEntity.getVelocity(), org.bukkit.craftbukkit.util.CraftVector.toBukkit(velocity)
|
|
|
|
+ );
|
|
|
|
+ event.callEvent();
|
|
|
|
+
|
|
|
|
+ if (!event.isCancelled() && event.getTo() != null) {
|
|
|
|
+ to = event.getTo().clone();
|
|
|
|
+ velocity = org.bukkit.craftbukkit.util.CraftVector.toNMS(event.getAfter());
|
|
|
|
+ }
|
2024-10-23 21:43:06 +02:00
|
|
|
+ teleportTarget = new TeleportTransition(((CraftWorld) to.getWorld()).getHandle(), CraftLocation.toVec3D(to), velocity, to.getYaw(), to.getPitch(), teleportTarget.missingRespawnBlock(), teleportTarget.asPassenger(), Set.of(), teleportTarget.postTeleportTransition(), teleportTarget.cause());
|
2024-09-22 23:35:04 +02:00
|
|
|
+ }
|
2024-06-14 02:08:12 +02:00
|
|
|
+ if (this.isRemoved()) {
|
|
|
|
+ return null;
|
|
|
|
+ }
|
|
|
|
+ // Paper end - Call EntityPortalExitEvent
|
|
|
|
// CraftBukkit end
|
|
|
|
ServerLevel worldserver1 = teleportTarget.newLevel();
|
2024-10-23 21:43:06 +02:00
|
|
|
boolean flag = worldserver1.dimension() != worldserver.dimension();
|