make EntityPortalReadyEvent#setTargetWorld work again

patches/api/Add-EntityPortalReadyEvent.patch

@@ -37,7 +37,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    private static final HandlerList HANDLER_LIST = new HandlerList();
 +
 +    private final PortalType portalType;
-+    private final World targetWorld;
++    private World targetWorld;
 +
 +    private boolean cancelled;
 +
@@ -71,11 +71,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * or {@link EntityPortalEvent}.
 +     *
 +     * @param targetWorld the world
-+     * @deprecated changing the target world has no effect
 +     */
-+    @Deprecated(forRemoval = true, since = "1.21")
 +    public void setTargetWorld(final @Nullable World targetWorld) {
-+        // this.targetWorld = targetWorld;
++        this.targetWorld = targetWorld;
 +    }
 +
 +    /**

patches/server/Add-EntityPortalReadyEvent.patch

@@ -4,25 +4,22 @@ 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
+diff --git a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
+--- a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -0,0 +0,0 @@ public class NetherPortalBlock extends Block implements Portal {
-             if (this.portalProcess != null) {
+         // CraftBukkit start
-                 if (this.portalProcess.processPortalTeleportation(worldserver, this, this.canUsePortal(false))) {
+         ResourceKey<Level> resourcekey = world.getTypeKey() == LevelStem.NETHER ? Level.OVERWORLD : Level.NETHER;
-                     worldserver.getProfiler().push("portal");
+         ServerLevel worldserver1 = world.getServer().getLevel(resourcekey);
-+                    // Paper start - Add EntityPortalReadyEvent
++        // Paper start - Add EntityPortalReadyEvent
-+                    ServerLevel changedTarget = worldserver.getServer().getLevel(worldserver.getTypeKey() == net.minecraft.world.level.dimension.LevelStem.NETHER ? Level.OVERWORLD : Level.NETHER);
++        io.papermc.paper.event.entity.EntityPortalReadyEvent portalReadyEvent = new io.papermc.paper.event.entity.EntityPortalReadyEvent(entity.getBukkitEntity(), worldserver1 == null ? null : worldserver1.getWorld(), org.bukkit.PortalType.NETHER);
-+                    if (this.portalProcess.isSamePortal(((net.minecraft.world.level.block.NetherPortalBlock) net.minecraft.world.level.block.Blocks.NETHER_PORTAL))) {
++        if (!portalReadyEvent.callEvent()) {
-+                        io.papermc.paper.event.entity.EntityPortalReadyEvent event = new io.papermc.paper.event.entity.EntityPortalReadyEvent(this.getBukkitEntity(), changedTarget == null ? null : changedTarget.getWorld(), org.bukkit.PortalType.NETHER);
++            entity.portalProcess = null;
-+                        if (!event.callEvent()) {
++            return null;
-+                            this.portalProcess = null;
++        }
-+                            worldserver.getProfiler().pop();
++        worldserver1 = portalReadyEvent.getTargetWorld() == null ? null : ((org.bukkit.craftbukkit.CraftWorld) portalReadyEvent.getTargetWorld()).getHandle();
-+                            return;
++        // Paper end - Add EntityPortalReadyEvent
-+                        }
-+                    }
-+                    // Paper end - Add EntityPortalReadyEvent
-                     this.setPortalCooldown();
-                     DimensionTransition dimensiontransition = this.portalProcess.getPortalDestination(worldserver, this);
  
+         if (worldserver1 == null) {
+             return new DimensionTransition(PlayerTeleportEvent.TeleportCause.NETHER_PORTAL); // always fire event in case plugins wish to change it