From 39b4e27e5b8f2699bed71108e8ed03260116753f Mon Sep 17 00:00:00 2001
From: Jeremy Wood <farachan@gmail.com>
Date: Wed, 3 Jul 2019 08:53:22 -0400
Subject: [PATCH] Use non-deprecated entity portal event.

---
 .../listeners/MVPortalListener.java           | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPortalListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPortalListener.java
index 31d6f469..8c825bd0 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPortalListener.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPortalListener.java
@@ -11,6 +11,7 @@ import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import org.bukkit.Material;
 import org.bukkit.PortalType;
+import org.bukkit.entity.Entity;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
@@ -37,13 +38,32 @@ public class MVPortalListener implements Listener {
      * @param event The event where an entity created a portal.
      */
     @EventHandler
-    public void entityPortalCreate(EntityCreatePortalEvent event) {
+    public void entityPortalCreate(PortalCreateEvent event) {
         if (event.isCancelled() || event.getBlocks().size() == 0) {
             return;
         }
-        MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(event.getEntity().getWorld());
-        // We have to do it like this due to a bug in 1.1-R3
-        if (world != null && !world.getAllowedPortals().isPortalAllowed(event.getPortalType())) {
+
+        Entity entity = event.getEntity();
+        if (entity == null) {
+            return;
+        }
+
+        MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(entity.getWorld());
+        if (world == null) {
+            return;
+        }
+
+        PortalType type = null;
+        switch (event.getReason()) {
+            case FIRE:
+            case NETHER_PAIR:
+                type = PortalType.NETHER;
+                break;
+            case END_PLATFORM:
+                type = PortalType.ENDER;
+        }
+
+        if (!world.getAllowedPortals().isPortalAllowed(type)) {
             event.setCancelled(true);
         }
     }