diff --git a/src/main/java/dev/the456gamer/EndthePortal/EndthePortal.java b/src/main/java/dev/the456gamer/EndthePortal/EndthePortal.java
index 3ffb7b8..bae7016 100644
--- a/src/main/java/dev/the456gamer/EndthePortal/EndthePortal.java
+++ b/src/main/java/dev/the456gamer/EndthePortal/EndthePortal.java
@@ -5,38 +5,25 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityPortalEvent;
+import org.bukkit.event.player.PlayerPortalEvent;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import java.util.logging.Logger;
-
 public final class EndthePortal extends JavaPlugin implements Listener {
 
-    Logger logger;
-
     @Override
     public void onEnable() {
-        // Plugin startup logic
-        this.logger = this.getLogger();
-        this.getServer().getPluginManager().registerEvents(this,this);
-
+        getServer().getPluginManager().registerEvents(this,this);
     }
 
-    @Override
-    public void onDisable() {
-        // Plugin shutdown logic
+    @EventHandler
+    public void onEntityPortal(final EntityPortalEvent event) {
+        if (event.getFrom().getBlock().getType() == Material.END_PORTAL && event.getFrom().getWorld().getEnvironment() == World.Environment.THE_END)
+            event.setCancelled(true);
     }
 
     @EventHandler
-    public void onEntityPortal(EntityPortalEvent event) {
-        //logger.info("got entity portal event " + event.getEntity() + ";" + event.getFrom().getWorld() + ";" + event.getFrom().getBlock());
-        if (event.getFrom().getBlock().getType().equals(Material.END_PORTAL)
-                && event.getFrom().getWorld().getEnvironment()
-                .equals(World.Environment.THE_END)) {
+    public void onPlayerPortal(final PlayerPortalEvent event) {
+        if (event.getFrom().getBlock().getType() == Material.END_PORTAL && event.getFrom().getWorld().getEnvironment() == World.Environment.THE_END)
             event.setCancelled(true);
-            //logger.info("prevented "+event.getEntity()+" from entering portal at "+event.getFrom());
-
-        }
     }
-
-
 }