diff --git a/src/main/java/net/minecraft/block/BlockEndPortal.java b/src/main/java/net/minecraft/block/BlockEndPortal.java
index 78c6c40..9a40593 100644
--- a/src/main/java/net/minecraft/block/BlockEndPortal.java
+++ b/src/main/java/net/minecraft/block/BlockEndPortal.java
@@ -92,9 +92,10 @@
 
 	public void onBlockAdded(World p_149726_1_, int p_149726_2_, int p_149726_3_, int p_149726_4_)
 	{
-		if (!field_149948_a)
+		if (!field_149948_a && !p_149726_1_.isRemote)
 		{
-			if (p_149726_1_.provider.dimensionId != 0)
+			int endlink = ((WorldServer)p_149726_1_).getConfig().portals.enderLink;
+			if(endlink == Integer.MIN_VALUE || endlink == p_149726_1_.provider.dimensionId)
 			{
 				p_149726_1_.setBlockToAir(p_149726_2_, p_149726_3_, p_149726_4_);
 			}