fixes node timer bug (fixes luanti-org#407).

doserj · doserj · commit 076f13cc0191 · 2013-01-11T18:59:27.000+01:00
Previously, when a block was activated, on_timer callbacks where
called with the relative position of the node inside the block,
instead of the absolute position of the node.
diff --git a/src/environment.cpp b/src/environment.cpp
@@ -804,7 +804,8 @@ void ServerEnvironment::activateBlock(MapBlock *block, u32 additional_dtime)
 				i = elapsed_timers.begin();
 				i != elapsed_timers.end(); i++){
 			n = block->getNodeNoEx(i->first);
-			if(scriptapi_node_on_timer(m_lua,i->first,n,i->second.elapsed))
+			v3s16 p = i->first + block->getPosRelative();
+			if(scriptapi_node_on_timer(m_lua,p,n,i->second.elapsed))
 				block->setNodeTimer(i->first,NodeTimer(i->second.timeout,0));
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -804,7 +804,8 @@ void ServerEnvironment::activateBlock(MapBlock *block, u32 additional_dtime)`
`804`	`804`	`i = elapsed_timers.begin();`
`805`	`805`	`i != elapsed_timers.end(); i++){`
`806`	`806`	`n = block->getNodeNoEx(i->first);`
`807`		`- if(scriptapi_node_on_timer(m_lua,i->first,n,i->second.elapsed))`
	`807`	`+ v3s16 p = i->first + block->getPosRelative();`
	`808`	`+ if(scriptapi_node_on_timer(m_lua,p,n,i->second.elapsed))`
`808`	`809`	`block->setNodeTimer(i->first,NodeTimer(i->second.timeout,0));`
`809`	`810`	`}`
`810`	`811`	`}`