Merge pull request #725 from ottools/master

Fix 'getTopMultiUseThing' returning border items. Closes #644
8 years ago · fa3068f6e6
parent 7a8e605704 d1b26781d3
commit fa3068f6e6
1 changed files with 1 additions and 1 deletions
--- a/src/client/tile.cpp
+++ b/src/client/tile.cpp
@ -485,7 +485,7 @@ ThingPtr Tile::getTopMultiUseThing()

    for(uint i = 0; i < m_things.size(); ++i) {
        ThingPtr thing = m_things[i];
-        if(!thing->isGround() && !thing->isOnBottom() && !thing->isOnTop()) {
+        if(!thing->isGround() && !thing->isGroundBorder() && !thing->isOnBottom() && !thing->isOnTop()) {
            if(i > 0 && thing->isSplash())
                return m_things[i-1];
            return thing;