More hooks for Scripts/Modules (#270)

2016-12-07 03:12:01 -05:00
parent 440b7e731f
commit b7ee1a9f12
8 changed files with 255 additions and 14 deletions
@@ -642,8 +642,11 @@ void Item::SetState(ItemUpdateState state, Player* forplayer)
    if (uState == ITEM_NEW && state == ITEM_REMOVED)
    {
        // pretend the item never existed
-        RemoveFromUpdateQueueOf(forplayer);
-        forplayer->DeleteRefundReference(GetGUIDLow());
+        if (forplayer)
+        {
+            RemoveFromUpdateQueueOf(forplayer);
+            forplayer->DeleteRefundReference(GetGUIDLow());
+        }
        delete this;
        return;
    }
@@ -652,8 +655,8 @@ void Item::SetState(ItemUpdateState state, Player* forplayer)
        // new items must stay in new state until saved
        if (uState != ITEM_NEW)
            uState = state;
-
-        AddToUpdateQueueOf(forplayer);
+        if (forplayer)
+            AddToUpdateQueueOf(forplayer);
    }
    else
    {