From 6415528f968f950cb6b4d6139e336f60a0260515 Mon Sep 17 00:00:00 2001 From: JacobF Date: Tue, 30 Aug 2011 11:38:53 -0400 Subject: [PATCH 1/2] If there was no source item in a furnace it would cause a segmentation fault. --- src/content_nodemeta.cpp | 2 +- src/inventory.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/content_nodemeta.cpp b/src/content_nodemeta.cpp index d29eea66..e8f1e197 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; diff --git a/src/inventory.cpp b/src/inventory.cpp index 62aedb53..116ceeb6 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -581,6 +581,8 @@ bool InventoryList::roomForItem(const InventoryItem *item) bool InventoryList::roomForCookedItem(const InventoryItem *item) { + if(!item) + return false; const InventoryItem *cook = item->createCookResult(); if(!cook) return false; From d6d479f94c83a765ab30e0d3d62207dca2e4db0c Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Wed, 31 Aug 2011 00:43:34 +0300 Subject: [PATCH 2/2] Updated changelog --- doc/changelog.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/doc/changelog.txt b/doc/changelog.txt index 2c577b42..d242070b 100644 --- a/doc/changelog.txt +++ b/doc/changelog.txt @@ -3,6 +3,15 @@ Minetest-c55 changelog This should contain all the major changes. For minor stuff, refer to the commit log of the repository. +X: +- Ladders +- Lava +- /me chat command +- Slightly better looking inventory (transparency) +- Fix the long-existed PeerNotFound loop bug +- Some translations and localization-related fixes +- Lots of small fixes, once again + 2011-07-31_3: - Fixes a bug that made the server to deny non-empty passwords from players connecting the first time