diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockRift.java b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockRift.java
index 78f666a..c7f8508 100644
--- a/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockRift.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockRift.java
@@ -7,7 +7,6 @@ import java.util.Queue;
 import java.util.Random;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockContainer;
 import net.minecraft.block.BlockFlowing;
 import net.minecraft.block.BlockFluid;
 import net.minecraft.block.ITileEntityProvider;
@@ -87,9 +86,6 @@ public class BlockRift extends Block implements ITileEntityProvider
 	{
 		return false;
 	}
-	
-	@Override
-	public void onBlockDestroyedByPlayer(World par1World, int par2, int par3, int par4, int par5) {}
 
 	@Override
 	public boolean isOpaqueCube()
@@ -116,10 +112,10 @@ public class BlockRift extends Block implements ITileEntityProvider
 		return true;
 	}
 	
-	//this doesnt do anything yet.
 	@Override
 	public int getRenderType()
 	{
+		// This doesn't do anything yet
 		if (mod_pocketDim.isPlayerWearingGoogles)
 		{
 			return 0;
@@ -235,7 +231,7 @@ public class BlockRift extends Block implements ITileEntityProvider
 		}
 	}
 	
-	private void addAdjacentBlocks(int x, int y, int z, int distance, HashMap<Point3D, Integer> pointDistances, Queue<Point3D> points)
+	private static void addAdjacentBlocks(int x, int y, int z, int distance, HashMap<Point3D, Integer> pointDistances, Queue<Point3D> points)
 	{
 		Point3D[] neighbors = new Point3D[] {
 				new Point3D(x - 1, y, z),
@@ -462,4 +458,15 @@ public class BlockRift extends Block implements ITileEntityProvider
 	{
 		return new TileEntityRift();
 	}
+	
+	@Override
+	public void breakBlock(World world, int x, int y, int z, int oldBlockID, int oldMeta)
+    {
+		// This function runs on the server side after a block is replaced
+		// We MUST call super.breakBlock() since it involves removing tile entities
+        super.breakBlock(world, x, y, z, oldBlockID, oldMeta);
+        
+        // Schedule rift regeneration for this block
+        mod_pocketDim.riftRegenerator.scheduleSlowRegeneration(x, y, z, world);
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/ticking/RiftRegenerator.java b/src/main/java/StevenDimDoors/mod_pocketDim/ticking/RiftRegenerator.java
index 0b957da..66bdd1d 100644
--- a/src/main/java/StevenDimDoors/mod_pocketDim/ticking/RiftRegenerator.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/ticking/RiftRegenerator.java
@@ -48,15 +48,23 @@ public class RiftRegenerator implements IRegularTickReceiver {
 		scheduleRegeneration(link, MIN_SLOW_DELAY, MAX_SLOW_DELAY);
 	}
 	
-	public void scheduleFastRegeneration(DimLink link)
+	public void scheduleSlowRegeneration(int x, int y, int z, World world)
 	{
-		scheduleRegeneration(link, MIN_FAST_DELAY, MAX_FAST_DELAY);
+		scheduleRegeneration(PocketManager.getLink(x, y, z, world), MIN_SLOW_DELAY, MAX_SLOW_DELAY);
+	}
+	
+	public void scheduleFastRegeneration(int x, int y, int z, World world)
+	{
+		scheduleRegeneration(PocketManager.getLink(x, y, z, world), MIN_FAST_DELAY, MAX_FAST_DELAY);
 	}
 	
 	private void scheduleRegeneration(DimLink link, int minDelay, int maxDelay)
 	{
-		int tickDelay = MathHelper.getRandomIntegerInRange(random, minDelay * TICKS_PER_SECOND, maxDelay * TICKS_PER_SECOND);
-		ticketQueue.add(new RiftTicket(link.source(), tickCount + tickDelay));
+		if (link != null)
+		{
+			int tickDelay = MathHelper.getRandomIntegerInRange(random, minDelay * TICKS_PER_SECOND, maxDelay * TICKS_PER_SECOND);
+			ticketQueue.add(new RiftTicket(link.source(), tickCount + tickDelay));
+		}
 	}
 	
 	private void processTicketQueue()
diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoor.java
index 9703ae1..781427b 100644
--- a/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoor.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoor.java
@@ -40,11 +40,7 @@ public class TileEntityDimDoor extends DDTileEntityBase
 		super.invalidate();
 		if (!worldObj.isRemote && worldObj.getBlockId(xCoord, yCoord, zCoord) == 0)
 		{
-			DimLink link = PocketManager.getLink(xCoord, yCoord, zCoord, worldObj);
-			if (link != null)
-			{
-				 mod_pocketDim.riftRegenerator.scheduleFastRegeneration(link);
-			}
+			mod_pocketDim.riftRegenerator.scheduleFastRegeneration(xCoord, yCoord, zCoord, worldObj);
 		}
 	}