papermc/patches/server/0807-Add-EntityPortalReadyEvent.patch

33 lines
2 KiB
Diff
Raw Normal View History

2022-07-22 23:23:12 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Wed, 12 May 2021 04:30:42 -0700
Subject: [PATCH] Add EntityPortalReadyEvent
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index b9a1a7edb9f9aea0fa53cc3edfbc4522949f4093..fc0f58560a53a783b9fabceee227bed3908bae89 100644
2022-07-22 23:23:12 +00:00
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3098,6 +3098,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
2022-07-22 23:23:12 +00:00
if (true && !this.isPassenger() && this.portalTime++ >= i) { // CraftBukkit
2023-06-08 08:47:19 +00:00
this.level().getProfiler().push("portal");
2022-07-22 23:23:12 +00:00
this.portalTime = i;
+ // Paper start - Add EntityPortalReadyEvent
+ io.papermc.paper.event.entity.EntityPortalReadyEvent event = new io.papermc.paper.event.entity.EntityPortalReadyEvent(this.getBukkitEntity(), worldserver1 == null ? null : worldserver1.getWorld(), org.bukkit.PortalType.NETHER);
2022-07-22 23:23:12 +00:00
+ if (!event.callEvent()) {
+ this.portalTime = 0;
+ } else {
+ worldserver1 = event.getTargetWorld() == null ? null : ((CraftWorld) event.getTargetWorld()).getHandle();
+ // Paper end - Add EntityPortalReadyEvent
2022-07-22 23:23:12 +00:00
this.setPortalCooldown();
// CraftBukkit start
if (this instanceof ServerPlayer) {
@@ -3105,6 +3112,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
2022-07-22 23:23:12 +00:00
} else {
this.changeDimension(worldserver1);
}
+ } // Paper - Add EntityPortalReadyEvent
2022-07-22 23:23:12 +00:00
// CraftBukkit end
2023-06-08 08:47:19 +00:00
this.level().getProfiler().pop();
2022-07-22 23:23:12 +00:00
}