Merge branch 'master' of https://github.com/Ayuto/EventScripts-Emulator

Author: Ayuto

addons/source-python/plugins/es_emulator/eventscripts/_libs/python/playerlib.py

@@ -247,7 +247,8 @@ def __getitem__(self, name):
             e = None
             try:
                 return_val = self.get(name)
-            except KeyError as e:
+            except KeyError as ex:
+                e = ex
                 return_val = None
             if name in _callable_attributes: # If the item is also callable we need ReturnValue to make it callable
                 return_val = self.ReturnValue(return_val)

addons/source-python/plugins/es_emulator/eventscripts/es_C.py

@@ -1782,7 +1782,9 @@ def keygroupmsg(argv):
         dbgmsg(0, 'Error: \'message\' subkey was not found inside keygroup {}'.format(key_group_name))
         return
 
-    create_message(edict, atoi(argv[2]), key_msg)
+    type = DialogType(atoi(argv[2]))
+
+    create_message(edict, type, key_msg)
 
 @command
 def keygrouprename(argv):
@@ -2506,6 +2508,8 @@ def sendkeypmsg(userid, type, key_ptr):
     if not key_ptr:
         dbgmsg(0, 'Error: Invalid key for sending VGUI message.')
 
+    type = DialogType(type)
+
     create_message(edict, type, _make_keyvalues(key_ptr))
 
 @command

addons/source-python/plugins/es_emulator/logic.py

@@ -342,7 +342,7 @@ def on_say(command, index, team_only):
 
     # TODO: es.regsaycmd() should be handled here and not with SP's
     #       get_say_command()
-    if es.addons.sayFilter(userid, command.arg_string, team_only):
+    if es.addons.sayFilter(userid, command.command_string, team_only):
         return CommandReturn.CONTINUE
 
     return CommandReturn.BLOCK
@@ -358,7 +358,7 @@ def fire_es_player_chat(command, userid, team_only):
     event.set_int('userid', userid)
     event.set_bool('teamonly', team_only)
 
-    full_text = command.arg_string
+    full_text = command.command_string
     if (userid > 0 and full_text[0] == '"'
             and full_text[-1] == '"'
             and full_text.count('"') <= 2):