diff --git a/Plugins/Mineplex.ClansGenerator/src/mineplex/clansgenerator/ClansGenerator.java b/Plugins/Mineplex.ClansGenerator/src/mineplex/clansgenerator/ClansGenerator.java
index fbab3adc7..2238167d5 100644
--- a/Plugins/Mineplex.ClansGenerator/src/mineplex/clansgenerator/ClansGenerator.java
+++ b/Plugins/Mineplex.ClansGenerator/src/mineplex/clansgenerator/ClansGenerator.java
@@ -99,6 +99,7 @@ public class ClansGenerator extends JavaPlugin implements Runnable, Listener
 		getServer().getPluginManager().registerEvents(this, this);
 	}
 	
+	@SuppressWarnings("deprecation")
 	@EventHandler
 	public void onPopulate(ChunkPopulateEvent event)
 	{
@@ -117,6 +118,27 @@ public class ClansGenerator extends JavaPlugin implements Runnable, Listener
 						{
 							getLogger().info("Removing dungeon pieces");
 						}
+						continue;
+					}
+					if (block.getType() == Material.LAVA)
+					{
+						byte data = block.getData();
+						block.setTypeIdAndData(Material.WATER.getId(), data, false);
+						if (_debug)
+						{
+							getLogger().info("Removing lava");
+						}
+						continue;
+					}
+					if (block.getType() == Material.STATIONARY_LAVA)
+					{
+						byte data = block.getData();
+						block.setTypeIdAndData(Material.STATIONARY_WATER.getId(), data, false);
+						if (_debug)
+						{
+							getLogger().info("Removing lava");
+						}
+						continue;
 					}
 				}
 			}