Fix factorization and dynmap patching issues

Signed-off-by: Ross Allan <rallanpcl@gmail.com>
MinimallyCorrect · Jun 19, 2013 · 74871fb · 74871fb
1 parent 7e76abb
commit 74871fb
Showing 1 changed file with 2 additions and 18 deletions.
diff --git a/resources/patches.xml b/resources/patches.xml
@@ -605,7 +605,7 @@
 		<class id="factorization.common.TileEntityRouter">
 			<newField field="emptyUpdateCount" class="int" code="0" static=""/>
 			<replaceMethod code="{
-				if (this.k.A(this.l, this.m, this.n)) {
+				if (this.^field:TileEntity/worldObj^.^method:World/isBlockGettingPowered^(this.l, this.m, this.n)) {
 					return false;
 				}
 				if (this.is_input) {
@@ -615,7 +615,7 @@
 					return ++emptyUpdateCount % 5 == 0;
 				}
 
-				return this.buffer.a &lt; this.buffer.d();
+				return this.buffer.^field:ItemStack/stackSize^ &lt; this.buffer.^method:ItemStack/getMaxStackSize^();
 			}">shouldUpdate
 			</replaceMethod>
 		</class>
@@ -1535,22 +1535,6 @@
 		</class>
 	</stevesCarts>
 	<dynmap>
-		<class id="org.dynmap.forge.DynmapPlugin">
-			<newMethod code="
-			public void handleUnload(yc world) {
-				if (last_world == world) {
-					last_world = null;
-					last_fworld = null;
-				}
-			}"/>
-			<synchronize>handleUnload,</synchronize>
-		</class>
-		<class id="org.dynmap.forge.DynmapPlugin$WorldTracker">
-			<insertAfter code="{
-				this$0.handleUnload($1.world);
-			}">handleWorldUnload,getWorld(Lyc;Z)Lorg.dynmap.forge.ForgeWorld;
-			</insertAfter>
-		</class>
 		<class id="org.dynmap.forge.SnapshotCache">
 			<synchronize/>
 		</class>