Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 10:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix server hang when stepping a furnace with a huge dtime

Browse Source
This commit is contained in:
Kahrl 2012-01-31 20:42:49 +01:00 committed by Perttu Ahola
parent 0e8bd531c2
commit 796009ef21
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/content_nodemeta.cpp
View File

@ -441,6 +441,10 @@ bool FurnaceNodeMetadata::step(float dtime)
{ {
if(dtime > 60.0) if(dtime > 60.0)
infostream<<"Furnace stepping a long time ("<<dtime<<")"<<std::endl; infostream<<"Furnace stepping a long time ("<<dtime<<")"<<std::endl;
InventoryList *dst_list = m_inventory->getList("dst");
assert(dst_list);
// Update at a fixed frequency // Update at a fixed frequency
const float interval = 2.0; const float interval = 2.0;
m_step_accumulator += dtime; m_step_accumulator += dtime;
@ -452,8 +456,7 @@ bool FurnaceNodeMetadata::step(float dtime)
//infostream<<"Furnace step dtime="<<dtime<<std::endl; //infostream<<"Furnace step dtime="<<dtime<<std::endl;
InventoryList *dst_list = m_inventory->getList("dst"); bool changed_this_loop = false;
assert(dst_list);
// Check // Check
// 1. if the source item is cookable // 1. if the source item is cookable
@ -473,7 +476,7 @@ bool FurnaceNodeMetadata::step(float dtime)
bool burning = (m_fuel_time < m_fuel_totaltime); bool burning = (m_fuel_time < m_fuel_totaltime);
if(burning) if(burning)
{ {
changed = true; changed_this_loop = true;
m_fuel_time += dtime; m_fuel_time += dtime;
} }
@ -483,7 +486,7 @@ bool FurnaceNodeMetadata::step(float dtime)
float burntime; float burntime;
if(burning) if(burning)
{ {
changed = true; changed_this_loop = true;
m_src_time += dtime; m_src_time += dtime;
m_src_totaltime = cooktime; m_src_totaltime = cooktime;
infotext = "Furnace is cooking"; infotext = "Furnace is cooking";
@ -491,7 +494,7 @@ bool FurnaceNodeMetadata::step(float dtime)
else if(getBurnResult(true, burntime)) else if(getBurnResult(true, burntime))
{ {
// Fuel inserted // Fuel inserted
changed = true; changed_this_loop = true;
m_fuel_time = 0; m_fuel_time = 0;
m_fuel_totaltime = burntime; m_fuel_totaltime = burntime;
//m_src_time += dtime; //m_src_time += dtime;
@ -507,7 +510,7 @@ bool FurnaceNodeMetadata::step(float dtime)
if(m_src_totaltime > 0.001 && m_src_time >= m_src_totaltime) if(m_src_totaltime > 0.001 && m_src_time >= m_src_totaltime)
{ {
// One item fully cooked // One item fully cooked
changed = true; changed_this_loop = true;
dst_list->addItem(cookresult_item); dst_list->addItem(cookresult_item);
getCookResult(true, cookresult, cooktime); // decrement source getCookResult(true, cookresult, cooktime); // decrement source
m_src_totaltime = 0; m_src_totaltime = 0;
@ -541,7 +544,7 @@ bool FurnaceNodeMetadata::step(float dtime)
if(infotext != m_infotext) if(infotext != m_infotext)
{ {
m_infotext = infotext; m_infotext = infotext;
changed = true; changed_this_loop = true;
} }
if(burning && m_fuel_time >= m_fuel_totaltime) if(burning && m_fuel_time >= m_fuel_totaltime)
@ -550,7 +553,11 @@ bool FurnaceNodeMetadata::step(float dtime)
m_fuel_totaltime = 0; m_fuel_totaltime = 0;
} }
if(!changed) if(changed_this_loop)
{
changed = true;
}
else
{ {
m_step_accumulator = 0; m_step_accumulator = 0;
break; break;