summaryrefslogtreecommitdiff
path: root/src/content_nodemeta.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-08-31 17:04:12 +0300
committerPerttu Ahola <celeron55@gmail.com>2011-08-31 17:04:12 +0300
commitad795c9f0c309d6d50b5679026690b055afe4a7c (patch)
tree0070cc19b3bfdf811a9c11ba83a57ce925e67953 /src/content_nodemeta.cpp
parentd6d479f94c83a765ab30e0d3d62207dca2e4db0c (diff)
parent6415528f968f950cb6b4d6139e336f60a0260515 (diff)
downloadminetest-ad795c9f0c309d6d50b5679026690b055afe4a7c.tar.gz
minetest-ad795c9f0c309d6d50b5679026690b055afe4a7c.tar.bz2
minetest-ad795c9f0c309d6d50b5679026690b055afe4a7c.zip
Merge remote-tracking branch 'queatz/furnace-fix'
Diffstat (limited to 'src/content_nodemeta.cpp')
-rw-r--r--src/content_nodemeta.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/content_nodemeta.cpp b/src/content_nodemeta.cpp
index d29eea661..e8f1e197e 100644
--- a/src/content_nodemeta.cpp
+++ b/src/content_nodemeta.cpp
@@ -293,7 +293,7 @@ bool FurnaceNodeMetadata::step(float dtime)
If there is no source item or source item is not cookable,
or furnace became overloaded, stop loop.
*/
- if((m_fuel_time < m_fuel_totaltime || dst_list->roomForCookedItem(src_item) == false)
+ if((m_fuel_time < m_fuel_totaltime || (src_item && dst_list->roomForCookedItem(src_item) == false))
&& (src_item == NULL || m_src_totaltime < 0.001))
{
m_step_accumulator = 0;