Ticket #4924: superhackylolnopeuneval.patch

binaries/data/mods/public/globalscripts/utility.js

@@ +1 @@
+function uneval2(map)
+{
+    let string = "";
+    for (let key of map.keys())
+    {
+        let value = map.get(key);
+
+        if (value.keys)
+            value = uneval2(value);
+        else if (typeof value == "object")
+            value = uneval(value);
+        else
+            value = uneval(value);
+
+        string += key + ": " + value;
+    }
+    return "{" + string + "}";
+}
+
 /**
  * "Inside-out" implementation of Fisher-Yates shuffle
  */

binaries/data/mods/public/gui/gamesetup/gamesetup.js

@@ +1 @@
+/*
+var cache = new Map();
+cache.set("m", new Map());
+cache.get("m").set("x", "y");
+
+warn(uneval2(cache));
+*/
 const g_MatchSettings_SP = "config/matchsettings.json";
 const g_MatchSettings_MP = "config/matchsettings.mp.json";
 

binaries/data/mods/public/simulation/components/AuraManager.js

@@ -105 +105 @@
     data.count = 1;
 
     let cache = this.templateModificationsCache.get(value).get(player);
-    if (!cache.get(classes))
-        cache.set(classes, new Map());
 
-    if (!cache.get(classes).get(key))
-        cache.get(classes).set(key, { "add": 0, "multiply": 1 });
+    if (!cache.get(uneval(classes)))
+        cache.set(uneval(classes), new Map());
 
+    if (!cache.get(uneval(classes)).get(key))
+        cache.get(uneval(classes)).set(key, { "add": 0, "multiply": 1 });
+
     if (data.add)
-        cache.get(classes).get(key).add += data.add;
+        cache.get(uneval(classes)).get(key).add += data.add;
     if (data.multiply)
-        cache.get(classes).get(key).multiply *= data.multiply;
+        cache.get(uneval(classes)).get(key).multiply *= data.multiply;
 
     Engine.PostMessage(SYSTEM_ENTITY, MT_TemplateModification, {
         "player": player,
@@ -181 +182 @@
     if (data.count > 0)
         return;
 
-    this.templateModificationsCache.get(value).get(player).get(classes).delete(key);
-    if (this.templateModificationsCache.get(value).get(player).get(classes).size == 0)
+    this.templateModificationsCache.get(value).get(player).get(uneval(classes)).delete(key);
+    if (this.templateModificationsCache.get(value).get(player).get(uneval(classes)).size == 0)
         this.templateModificationsCache.get(value).get(player).delete(classes);
 
     // clean up the object