PaperMC/patches/server/0853-Add-EntityPortalReadyEvent.patch

33 lines
1.9 KiB
Diff
Raw Normal View History

2022-07-23 01:23:12 +02: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
2023-06-09 01:21:20 +02:00
index 2d576dd1e484641115ce73c22faad27f9e7bcc54..b5751d0cfae442b1030b771e4a3afc42e566d76d 100644
2022-07-23 01:23:12 +02:00
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
2023-06-09 01:21:20 +02:00
@@ -3033,6 +3033,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
2022-07-23 01:23:12 +02:00
if (true && !this.isPassenger() && this.portalTime++ >= i) { // CraftBukkit
2023-06-08 10:47:19 +02:00
this.level().getProfiler().push("portal");
2022-07-23 01:23:12 +02:00
this.portalTime = i;
+ // Paper start
+ 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-23 01:23:12 +02:00
+ if (!event.callEvent()) {
+ this.portalTime = 0;
+ } else {
+ worldserver1 = event.getTargetWorld() == null ? null : ((CraftWorld) event.getTargetWorld()).getHandle();
+ // Paper end
this.setPortalCooldown();
// CraftBukkit start
if (this instanceof ServerPlayer) {
2023-06-09 01:21:20 +02:00
@@ -3040,6 +3047,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
2022-07-23 01:23:12 +02:00
} else {
this.changeDimension(worldserver1);
}
+ } // Paper
// CraftBukkit end
2023-06-08 10:47:19 +02:00
this.level().getProfiler().pop();
2022-07-23 01:23:12 +02:00
}