Sky: Darker, bluer sky and improved horizon haze at night

[dragonfireclient.git] / src / serverobject.cpp

diff --git a/src/serverobject.cpp b/src/serverobject.cpp
index 95735de17ce4a2f36aacba35ab40179acabfe12e..236d7e8dc06feaaca81fedb4c3479fc87ed3d103 100644 (file)
--- a/src/serverobject.cpp
+++ b/src/serverobject.cpp
@@ -38,17 +38,21 @@ ServerActiveObject::~ServerActiveObject()
 {
 }
 
-ServerActiveObject* ServerActiveObject::create(u8 type,
+ServerActiveObject* ServerActiveObject::create(ActiveObjectType type,
                ServerEnvironment *env, u16 id, v3f pos,
                const std::string &data)
 {
        // Find factory function
        std::map<u16, Factory>::iterator n;
        n = m_types.find(type);
-       if(n == m_types.end())
-       {
+       if(n == m_types.end()) {
+               // These are 0.3 entity types, return without error.
+               if (ACTIVEOBJECT_TYPE_ITEM <= type && type <= ACTIVEOBJECT_TYPE_MOBV2) {
+                       return NULL;
+               }
+
                // If factory is not found, just return.
-               dstream<<"WARNING: ServerActiveObject: No factory for type="
+               warningstream<<"ServerActiveObject: No factory for type="
                                <<type<<std::endl;
                return NULL;
        }
@@ -78,7 +82,7 @@ ItemStack ServerActiveObject::getWieldedItem() const
        if(inv)
        {
                const InventoryList *list = inv->getList(getWieldList());
-               if(list)
+               if(list && (getWieldIndex() < (s32)list->getSize())) 
                        return list->getItem(getWieldIndex());
        }
        return ItemStack();
@@ -86,14 +90,9 @@ ItemStack ServerActiveObject::getWieldedItem() const
 
 bool ServerActiveObject::setWieldedItem(const ItemStack &item)
 {
-       Inventory *inv = getInventory();
-       if(inv)
-       {
-               InventoryList *list = inv->getList(getWieldList());
-               if (list)
-               {
+       if(Inventory *inv = getInventory()) {
+               if (InventoryList *list = inv->getList(getWieldList())) {
                        list->changeItem(getWieldIndex(), item);
-                       setInventoryModified();
                        return true;
                }
        }