diff --git a/src/main/java/net/minecraft/world/World.java b/src/main/java/net/minecraft/world/World.java
index 932c90c..19a670e 100644
--- a/src/main/java/net/minecraft/world/World.java
+++ b/src/main/java/net/minecraft/world/World.java
@@ -440,25 +440,27 @@
 				if ((p_147465_6_ & 1) != 0)
 				{
 					block1 = chunk.getBlock(p_147465_1_ & 15, p_147465_2_, p_147465_3_ & 15);
-					if (this.captureBlockSnapshots && block1 != null && !this.isRemote)
-					{
-						blockSnapshot = net.minecraftforge.common.util.BlockSnapshot.getBlockSnapshot(this, p_147465_1_, p_147465_2_, p_147465_3_, p_147465_6_);
-						this.capturedBlockSnapshots.add(blockSnapshot);
-					}
+				}
+
+				if (this.captureBlockSnapshots && !this.isRemote)
+				{
+					blockSnapshot = net.minecraftforge.common.util.BlockSnapshot.getBlockSnapshot(this, p_147465_1_, p_147465_2_, p_147465_3_, p_147465_6_);
+					this.capturedBlockSnapshots.add(blockSnapshot);
 				}
 
 				boolean flag = chunk.func_150807_a(p_147465_1_ & 15, p_147465_2_, p_147465_3_ & 15, p_147465_4_, p_147465_5_);
 
-				if (!flag && this.captureBlockSnapshots && block1 != null && !this.isRemote) 
+				if (!flag && blockSnapshot != null)
 				{
 					this.capturedBlockSnapshots.remove(blockSnapshot);
+					blockSnapshot = null;
 				}
 
 				this.theProfiler.startSection("checkLight");
 				this.func_147451_t(p_147465_1_, p_147465_2_, p_147465_3_);
 				this.theProfiler.endSection();
 
-				if (flag && !this.captureBlockSnapshots) // Don't notify clients or update physics while capturing blockstates
+				if (flag && blockSnapshot == null) // Don't notify clients or update physics while capturing blockstates
 				{
 					// Modularize client and physic updates
 					this.markAndNotifyBlock(p_147465_1_, p_147465_2_, p_147465_3_, chunk, block1, p_147465_4_, p_147465_6_);
diff --git a/src/main/java/net/minecraftforge/common/ForgeVersion.java b/src/main/java/net/minecraftforge/common/ForgeVersion.java
index 7529af3..d0f29bd 100644
--- a/src/main/java/net/minecraftforge/common/ForgeVersion.java
+++ b/src/main/java/net/minecraftforge/common/ForgeVersion.java
@@ -23,7 +23,7 @@
 	//This number is incremented every minecraft release, never reset
 	public static final int minorVersion    = 13;
 	//This number is incremented every time a interface changes or new major feature is added, and reset every Minecraft version
-	public static final int revisionVersion = 1;
+	public static final int revisionVersion = 2;
 	//This number is incremented every time Jenkins builds Forge, and never reset. Should always be 0 in the repo code.
 	public static final int buildVersion    = 0;
 
diff --git a/src/main/resources/fmlversion.properties b/src/main/resources/fmlversion.properties
index 7fa24d1..a02fa77 100644
--- a/src/main/resources/fmlversion.properties
+++ b/src/main/resources/fmlversion.properties
@@ -1,6 +1,6 @@
 fmlbuild.major.number=7
 fmlbuild.minor.number=10
 fmlbuild.revision.number=85
-fmlbuild.build.number=16
+fmlbuild.build.number=17
 fmlbuild.mcversion=1.7.10
 fmlbuild.mcpversion=9.05