Merge pull request #318 from conde2/master

Fix #316

modules/game_console/console.lua

@@ -466,7 +466,7 @@ function addTabText(text, speaktype, tab, creatureName)
       -- Remove the curly braces
       for i = 1, #highlightData / 3 do
         local dataBlock = { _start = highlightData[(i-1)*3+1], _end = highlightData[(i-1)*3+2], words = highlightData[(i-1)*3+3] }
-        text = text:gsub("{"..dataBlock.words.."}", dataBlock.words)
+        text = text:gsub("%{(.-)%}", dataBlock.words, 1)
 
         -- Recalculate positions as braces are removed
         highlightData[(i-1)*3+1] = dataBlock._start - ((i-1) * 2)

src/client/tile.cpp

@@ -449,14 +449,14 @@ ThingPtr Tile::getTopMultiUseThing()
     if(isEmpty())
         return nullptr;
 
-    if(CreaturePtr topCreature = getTopCreature())
-        return topCreature;
-
     for(uint i = 0; i < m_things.size(); ++i) {
         ThingPtr thing = m_things[i];
         if(thing->isForceUse())
             return thing;
     }
+    
+    if(CreaturePtr topCreature = getTopCreature())
+        return topCreature;
 
     for(uint i = 0; i < m_things.size(); ++i) {
         ThingPtr thing = m_things[i];