From fcd1dd2ff2c01e87f54fd23f3f3f02b40f601243 Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Mon, 6 Sep 2021 20:39:54 +0900
Subject: [PATCH] kay it works

---
 src/net/torvald/terrarum/gameactors/ActorWithBody.kt |  2 +-
 src/net/torvald/terrarum/serialise/WriteActor.kt     | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/net/torvald/terrarum/gameactors/ActorWithBody.kt b/src/net/torvald/terrarum/gameactors/ActorWithBody.kt
index 4ca35c388..b6a725333 100644
--- a/src/net/torvald/terrarum/gameactors/ActorWithBody.kt
+++ b/src/net/torvald/terrarum/gameactors/ActorWithBody.kt
@@ -12,7 +12,6 @@ import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE
 import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZED
 import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZEF
 import net.torvald.terrarum.blockproperties.Block
-import net.torvald.terrarum.blockproperties.BlockCodex
 import net.torvald.terrarum.blockproperties.BlockProp
 import net.torvald.terrarum.gamecontroller.KeyToggler
 import net.torvald.terrarum.gameitem.ItemID
@@ -1658,6 +1657,7 @@ open class ActorWithBody : Actor {
                 printdbgerr(this, actorValue.getAsString(AVKey.NAME))
                 printdbgerr(this, if (this is HasAssembledSprite) this.animDescPath else "(not HasAssembledSprite)")
                 printdbgerr(this, e)
+                throw e
             }
         }
     }
diff --git a/src/net/torvald/terrarum/serialise/WriteActor.kt b/src/net/torvald/terrarum/serialise/WriteActor.kt
index 705b7fbb6..b7cebd211 100644
--- a/src/net/torvald/terrarum/serialise/WriteActor.kt
+++ b/src/net/torvald/terrarum/serialise/WriteActor.kt
@@ -2,7 +2,6 @@ package net.torvald.terrarum.serialise
 
 import net.torvald.spriteanimation.HasAssembledSprite
 import net.torvald.spriteanimation.SpriteAnimation
-import net.torvald.terrarum.AppLoader.printdbgerr
 import net.torvald.terrarum.NoSuchActorWithIDException
 import net.torvald.terrarum.gameactors.Actor
 import net.torvald.terrarum.gameactors.ActorWithBody
@@ -65,13 +64,10 @@ object ReadActor {
         if (actor is Pocketed)
             actor.inventory.actor = actor
 
-        if (actor is ActorWithBody) {
+        if (actor is ActorWithBody && actor is HasAssembledSprite) {
             actor.sprite = SpriteAnimation(actor)
-
-            if (actor is HasAssembledSprite) {
-                if (actor.animDescPathGlow != null) actor.spriteGlow = SpriteAnimation(actor)
-                actor.reassembleSprite(actor.sprite!!, actor.spriteGlow)
-            }
+            if (actor.animDescPathGlow != null) actor.spriteGlow = SpriteAnimation(actor)
+            actor.reassembleSprite(actor.sprite!!, actor.spriteGlow)
         }
 
         return actor