mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-19 14:59:32 +00:00
45 lines
2.9 KiB
Diff
45 lines
2.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: violetc <58360096+s-yh-china@users.noreply.github.com>
|
|
Date: Thu, 2 Jan 2025 22:01:17 +0800
|
|
Subject: [PATCH] Fix EntityPortalExitEvent logic
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
|
index 58906cda0432dc8d5988f83f19a5f2deac094566..bfbb894f73251ec241451bee831ebf7973cb4293 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
|
@@ -3962,19 +3962,29 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
|
}
|
|
if (this.portalProcess != null) { // if in a portal
|
|
CraftEntity bukkitEntity = this.getBukkitEntity();
|
|
+ org.bukkit.util.Vector after = org.bukkit.craftbukkit.util.CraftVector.toBukkit(velocity); // Leaves - fix
|
|
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)
|
|
+ bukkitEntity.getVelocity(), after // Leaves - fix
|
|
);
|
|
event.callEvent();
|
|
|
|
+ // Leaves start - fix
|
|
// Only change the target if actually needed, since we reset relative flags
|
|
- if (!event.isCancelled() && event.getTo() != null && (!event.getTo().equals(event.getFrom()) || !event.getAfter().equals(event.getBefore()))) {
|
|
- to = event.getTo().clone();
|
|
- velocity = org.bukkit.craftbukkit.util.CraftVector.toNMS(event.getAfter());
|
|
+ if (event.isCancelled() || (!to.equals(event.getTo()) || !after.equals(event.getAfter()))) {
|
|
+ if (!event.isCancelled()) {
|
|
+ if (event.getTo() != null) {
|
|
+ to = event.getTo().clone();
|
|
+ }
|
|
+ velocity = org.bukkit.craftbukkit.util.CraftVector.toNMS(event.getAfter());
|
|
+ } else {
|
|
+ to = event.getFrom().clone();
|
|
+ velocity = Vec3.ZERO;
|
|
+ }
|
|
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());
|
|
}
|
|
+ // Leaves end - fix
|
|
}
|
|
if (this.isRemoved()) {
|
|
return null;
|