Merge branch 'upstream/0.7.1' into 0.7.1

Author: Sarevalak

scripts/eventHandler.lua

@@ -1218,13 +1218,17 @@ eventHandler.OnGenericObjectEvent = function(pid, cellDescription, packetType)
 
         tes3mp.ReadReceivedObjectList()
         local packetOrigin = tes3mp.GetObjectListOrigin()
+        local clientScript
         tes3mp.LogAppend(enumerations.log.INFO, "- packetOrigin was " ..
             tableHelper.getIndexByValue(enumerations.packetOrigin, packetOrigin))
 
         if logicHandler.IsPacketFromConsole(packetOrigin) and not logicHandler.IsPlayerAllowedConsole(pid) then
             tes3mp.Kick(pid)
             tes3mp.SendMessage(pid, logicHandler.GetChatName(pid) .. consoleKickMessage, true)
             return
+        elseif logicHandler.IsPacketFromClientScript(packetOrigin) then
+            clientScript = tes3mp.GetObjectListClientScript()
+            tes3mp.LogAppend(enumerations.log.INFO, "- clientScript was " .. clientScript)
         end
 
         local isCellLoaded = LoadedCells[cellDescription] ~= nil

scripts/logicHandler.lua

@@ -371,6 +371,16 @@ logicHandler.IsPacketFromConsole = function(packetOrigin)
     return false
 end
 
+logicHandler.IsPacketFromClientScript = function(packetOrigin)
+
+    if packetOrigin == enumerations.packetOrigin.CLIENT_SCRIPT_LOCAL or
+        packetOrigin == enumerations.packetOrigin.CLIENT_SCRIPT_GLOBAL then
+        return true
+    end
+
+    return false
+end
+
 logicHandler.SendClientScriptDisables = function(pid, forEveryone)
 
     tes3mp.ClearRecords()

scripts/world/base.lua

@@ -49,9 +49,9 @@ function BaseWorld:EnsureCoreVariablesExist()
         if self.data.general.currentMpNum ~= nil then
             self.coreVariables.currentMpNum = self.data.general.currentMpNum
             self.data.general.currentMpNum = nil
+        else
+            self.coreVariables.currentMpNum = 0
         end
-    else
-        self.coreVariables.currentMpNum = 0
     end
 
     if self.coreVariables.hasRunStartupScripts == nil then