Merge remote-tracking branch 'origin/master'

Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestore.java

@@ -94,6 +94,14 @@ public class BlockRestore extends MiniPlugin
 		_blocks.remove(block).restore();
 	}
 	
+	public void RestoreAll()
+	{
+		for (BlockRestoreData data : _blocks.values())
+			data.restore();
+		
+		_blocks.clear();
+	}
+	
 	public HashSet<Location> RestoreBlockAround(Material type, Location location, int radius)
 	{
 		HashSet<Location> restored = new HashSet<Location>();

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java

@@ -1910,6 +1910,7 @@ public class MineStrike extends TeamGame
 
 		//Incendiary
 		_incendiary.clear();
+		Manager.GetBlockRestore().RestoreAll();
 
 		//Restock Ammo
 		for (Gun gun : _gunsEquipped.keySet())