33 lines
1.9 KiB
Diff
33 lines
1.9 KiB
Diff
|
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 19a64b582bc042e426220e080d9c21b3a82cf3f7..cff8490a2f08215fdd8c5d819ec76cafd8a8cb90 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
@@ -2856,6 +2856,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
||
|
|
if (true && !this.isPassenger() && this.portalTime++ >= i) { // CraftBukkit
|
||
|
|
this.level.getProfiler().push("portal");
|
||
|
|
this.portalTime = i;
|
||
|
|
+ // Paper start
|
||
|
|
+ io.papermc.paper.event.entity.EntityPortalReadyEvent event = new io.papermc.paper.event.entity.EntityPortalReadyEvent(this.getBukkitEntity(), worldserver1 == null ? null : worldserver.getWorld(), org.bukkit.PortalType.NETHER);
|
||
|
|
+ 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) {
|
||
|
|
@@ -2863,6 +2870,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
||
|
|
} else {
|
||
|
|
this.changeDimension(worldserver1);
|
||
|
|
}
|
||
|
|
+ } // Paper
|
||
|
|
// CraftBukkit end
|
||
|
|
this.level.getProfiler().pop();
|
||
|
|
}
|