Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x

src/server/scripts/Commands/cs_modify.cpp

@@ -1129,7 +1129,12 @@ public:
 
         uint16 drunkMod = drunklevel * 0xFFFF / 100;
 
-        handler->GetSession()->GetPlayer()->SetDrunkValue(drunkMod);
+        Player* target = handler->getSelectedPlayer();
+        if (!target)
+            target = handler->GetSession()->GetPlayer();
+
+        if (target)
+            target->SetDrunkValue(drunkMod);
 
         return true;
     }