diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
index a8802ebd8..a75711637 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
@@ -9,13 +9,13 @@ import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Chunk;
 import org.bukkit.Difficulty;
-import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.World.Environment;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
+import org.bukkit.block.BlockState;
 import org.bukkit.craftbukkit.v1_6_R3.CraftServer;
 import org.bukkit.craftbukkit.v1_6_R3.CraftWorld;
 import org.bukkit.enchantments.Enchantment;
@@ -30,6 +30,8 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.entity.EntityCreatePortalEvent;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDeathEvent;
@@ -100,6 +102,8 @@ public class UHC extends TeamGame
 	private ArrayList<Location> _portal = null;
 	private boolean _portalCreated = false;
 	private GameTeam _lastDragonDamager = null;
+	
+	private Location _exitLocation = null;
 
 	public UHC(ArcadeManager manager)
 	{ 
@@ -175,7 +179,7 @@ public class UHC extends TeamGame
 	}
 	
 	@EventHandler
-	public void endPortalTransfer(PlayerPortalEvent event)
+	public void endPortalTransfer(final PlayerPortalEvent event)
 	{
 		if (event.getCause() == TeleportCause.END_PORTAL)
 		{
@@ -183,6 +187,15 @@ public class UHC extends TeamGame
 			event.getPlayer().teleport(((CraftServer)Bukkit.getServer()).getHandle().getServer().getPlayerList().calculateTarget(event.getPlayer().getLocation(), ((CraftWorld)Bukkit.getWorld("world_the_end")).getHandle()));
 		}
 	}
+	
+	@EventHandler
+	public void endPortalCreation(final EntityCreatePortalEvent event)
+	{
+		if (event.getEntity() instanceof EnderDragon)
+		{
+			event.setCancelled(true);
+		}
+	}
 
 	@EventHandler
 	public void TimeUpdate(UpdateEvent event)