Merge branch 'stage' into fix/83/tracked-event-infinite-loop

regal · Oct 26, 2019 · 98eceed · 98eceed
2 parents e1130ee + cc445d8
commit 98eceed
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/agents/impl/instance-agents-impl.ts b/src/agents/impl/instance-agents-impl.ts
@@ -218,10 +218,6 @@ class InstanceAgentsImpl implements InstanceAgentsInternal {
             );
             value = this.game.using(value);
             value = new AgentArrayReference(value.meta.id);
-        } else if (typeof value === "function") {
-            throw new RegalError(
-                "Agents can't have arrow functions as properties. If you need a class method, please use traditional function syntax."
-            );
         }
 
         am.setProperty(property, value);

diff --git a/test/unit/agents.test.ts b/test/unit/agents.test.ts
@@ -2004,14 +2004,18 @@ describe("Agents", function() {
                 expect(() => myGame.using(_d)).to.throw(RegalError);
             });
 
-            it("Throws a RegalError if an agent's property is set to an arrow function", function() {
+            class ArrowFuncAgent extends Agent {
+                constructor(public func: () => {}) {
+                    super();
+                }
+            }
+
+            it("Agent properties can be arrow functions", function() {
                 Game.init(MD);
                 const myGame = buildGameInstance();
-                const dummy = myGame.using(new Dummy("D1", 1));
+                const dummy = myGame.using(new ArrowFuncAgent(() => "yo"));
 
-                expect(() => ((dummy as any).foo = () => "yo")).to.throw(
-                    RegalError
-                );
+                expect(dummy.func()).to.equal("yo");
             });
         });
     });