From ee3b72949e912f0dd03de3bf02547b0f2a834c48 Mon Sep 17 00:00:00 2001
From: Song Minjae <alswo9628@gmail.com>
Date: Sun, 5 Feb 2017 03:05:18 +0900
Subject: [PATCH] HumanoidNPC: explicit initialiser call no longer required

Former-commit-id: ecc822302182bc55f9a11ede39f74bfaf8fe6c87
Former-commit-id: 92f49eb574cb4f7bbf93dae8bf0ff32fa33a74ae
---
 src/net/torvald/terrarum/gameactors/HumanoidNPC.kt          | 5 +++++
 src/net/torvald/terrarum/gameactors/PlayerBuilderCynthia.kt | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/net/torvald/terrarum/gameactors/HumanoidNPC.kt b/src/net/torvald/terrarum/gameactors/HumanoidNPC.kt
index 0959cfb36..4d78cfa0c 100644
--- a/src/net/torvald/terrarum/gameactors/HumanoidNPC.kt
+++ b/src/net/torvald/terrarum/gameactors/HumanoidNPC.kt
@@ -3,6 +3,7 @@ package net.torvald.terrarum.gameactors
 import net.torvald.terrarum.gameactors.ActorHumanoid
 import net.torvald.terrarum.gameactors.ai.AILuaAPI
 import net.torvald.terrarum.gameactors.ai.ActorAI
+import net.torvald.terrarum.gameactors.ai.LuaAIWrapper
 import net.torvald.terrarum.gameitem.EquipPosition
 import net.torvald.terrarum.gameitem.InventoryItem
 import org.luaj.vm2.*
@@ -26,6 +27,10 @@ open class HumanoidNPC(
         born: GameDate
 ) : ActorHumanoid(born), AIControlled, CanBeAnItem {
 
+    constructor(luaAi: LuaAIWrapper, born: GameDate) : this(luaAi as ActorAI, born) {
+        luaAi.attachActor(this)
+    }
+
     companion object {
         val DEFAULT_COLLISION_TYPE = ActorWithSprite.COLLISION_DYNAMIC
     }
diff --git a/src/net/torvald/terrarum/gameactors/PlayerBuilderCynthia.kt b/src/net/torvald/terrarum/gameactors/PlayerBuilderCynthia.kt
index 543f293c5..4e3a80a12 100644
--- a/src/net/torvald/terrarum/gameactors/PlayerBuilderCynthia.kt
+++ b/src/net/torvald/terrarum/gameactors/PlayerBuilderCynthia.kt
@@ -16,7 +16,6 @@ object PlayerBuilderCynthia {
                 LuaAIWrapper("/net/torvald/terrarum/gameactors/ai/scripts/PokemonNPCAI.lua"),
                 GameDate(100, 143)) // random value thrown
         InjectCreatureRaw(p.actorValue, "CreatureHuman.json")
-        (p.ai as LuaAIWrapper).attachActor(p)
 
 
         p.actorValue[AVKey.__PLAYER_QUICKBARSEL] = 0