Fix EntityPortalExitEvent not being called (#5617)
Dieser Commit ist enthalten in:
Ursprung
d54e8c52bc
Commit
e155002b31
21
patches/api/0336-add-back-EntityPortalExitEvent.patch
Normale Datei
21
patches/api/0336-add-back-EntityPortalExitEvent.patch
Normale Datei
@ -0,0 +1,21 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||||
Date: Wed, 12 May 2021 02:49:28 -0700
|
||||
Subject: [PATCH] add back EntityPortalExitEvent
|
||||
|
||||
Was removed here: https://hub.spigotmc.org/stash/projects/SPIGOT/repos/craftbukkit/commits/a2d787f6ebeb72fa7d5750788221fb9a0d838ac4
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/event/entity/EntityPortalExitEvent.java b/src/main/java/org/bukkit/event/entity/EntityPortalExitEvent.java
|
||||
index 869ad3b12ebd8275d04b0c21b5ecc0389da01490..0a87e2934901eb1bcaec72ed8141cd4828a4efce 100644
|
||||
--- a/src/main/java/org/bukkit/event/entity/EntityPortalExitEvent.java
|
||||
+++ b/src/main/java/org/bukkit/event/entity/EntityPortalExitEvent.java
|
||||
@@ -11,6 +11,9 @@ import org.jetbrains.annotations.NotNull;
|
||||
* <p>
|
||||
* This event allows you to modify the velocity of the entity after they have
|
||||
* successfully exited the portal.
|
||||
+ * <p>
|
||||
+ * Cancelling this event does not prevent the teleport, but it does prevent
|
||||
+ * any changes to velocity and location from taking place.
|
||||
*/
|
||||
public class EntityPortalExitEvent extends EntityTeleportEvent {
|
||||
private static final HandlerList handlers = new HandlerList();
|
41
patches/server/0818-Add-back-EntityPortalExitEvent.patch
Normale Datei
41
patches/server/0818-Add-back-EntityPortalExitEvent.patch
Normale Datei
@ -0,0 +1,41 @@
|
||||
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
|
||||
index 4f164f238177b5e2b18c76b7cc14596ec93409d1..5c0d4c5cfef969cf3864a2c055dd0a51d0cfa770 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
@@ -3179,6 +3179,19 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
|
||||
if (shapedetectorshape == null) {
|
||||
return null;
|
||||
} else {
|
||||
+ // Paper start - Call EntityPortalExitEvent
|
||||
+ Vec3 position = shapedetectorshape.pos;
|
||||
+ float yaw = shapedetectorshape.yRot;
|
||||
+ float pitch = shapedetectorshape.xRot;
|
||||
+ Vec3 velocity = shapedetectorshape.speed;
|
||||
+ org.bukkit.event.entity.EntityPortalExitEvent event = new org.bukkit.event.entity.EntityPortalExitEvent(this.getBukkitEntity(), this.getBukkitEntity().getLocation(), shapedetectorshape.portalEventInfo.getTo(), this.getBukkitEntity().getVelocity(), org.bukkit.craftbukkit.util.CraftVector.toBukkit(shapedetectorshape.speed));
|
||||
+ if (event.callEvent() && event.getTo() != null && this.isAlive()) {
|
||||
+ position = Vec3.atLowerCornerOf(MCUtil.toBlockPosition(event.getTo()));
|
||||
+ yaw = event.getTo().getYaw();
|
||||
+ pitch = event.getTo().getPitch();
|
||||
+ velocity = org.bukkit.craftbukkit.util.CraftVector.toNMS(event.getAfter());
|
||||
+ }
|
||||
+ // Paper end
|
||||
// CraftBukkit start
|
||||
worldserver = shapedetectorshape.world;
|
||||
this.unRide();
|
||||
@@ -3194,8 +3207,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
|
||||
|
||||
if (entity != null) {
|
||||
entity.restoreFrom(this);
|
||||
- entity.moveTo(shapedetectorshape.pos.x, shapedetectorshape.pos.y, shapedetectorshape.pos.z, shapedetectorshape.yRot, entity.getXRot());
|
||||
- entity.setDeltaMovement(shapedetectorshape.speed);
|
||||
+ entity.moveTo(position.x, position.y, position.z, yaw, pitch); // Paper - respect EntityPortalExitEvent values
|
||||
+ entity.setDeltaMovement(velocity); // Paper - respect EntityPortalExitEvent values
|
||||
worldserver.addDuringTeleport(entity);
|
||||
if (worldserver.getTypeKey() == DimensionType.END_LOCATION) { // CraftBukkit
|
||||
ServerLevel.makeObsidianPlatform(worldserver, this); // CraftBukkit
|
In neuem Issue referenzieren
Einen Benutzer sperren