Skip to content

Commit d9e836c

Browse files
committed
fix: Citizens trait (#210)
1 parent bc79872 commit d9e836c

File tree

1 file changed

+3
-13
lines changed
  • core/src/main/kotlin/kr/toxicity/model/compatibility/citizens/trait

1 file changed

+3
-13
lines changed

core/src/main/kotlin/kr/toxicity/model/compatibility/citizens/trait/ModelTrait.kt

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,17 @@ package kr.toxicity.model.compatibility.citizens.trait
88

99
import kr.toxicity.model.api.BetterModel
1010
import kr.toxicity.model.api.data.renderer.ModelRenderer
11-
import net.citizensnpcs.api.event.DespawnReason
1211
import net.citizensnpcs.api.trait.Trait
1312
import net.citizensnpcs.api.trait.TraitName
1413
import net.citizensnpcs.api.util.DataKey
15-
import net.citizensnpcs.api.util.RemoveReason
1614

1715
@TraitName("model")
1816
class ModelTrait : Trait("model") {
1917
private var _renderer: ModelRenderer? = null
2018
var renderer
2119
get() = _renderer
2220
set(value) {
23-
npc.entity?.let {
21+
npc?.entity?.let {
2422
value?.create(it) ?: BetterModel.registryOrNull(it.uniqueId)?.close()
2523
}
2624
_renderer = value
@@ -35,13 +33,13 @@ class ModelTrait : Trait("model") {
3533
}
3634

3735
override fun save(key: DataKey) {
38-
npc.entity?.uniqueId?.let { uuid ->
36+
npc?.entity?.uniqueId?.let { uuid ->
3937
key.setString("", BetterModel.registryOrNull(uuid)?.first()?.name())
4038
}
4139
}
4240

4341
override fun onSpawn() {
44-
npc.entity?.let {
42+
npc?.entity?.let {
4543
if (BetterModel.registryOrNull(it.uniqueId) == null) {
4644
renderer?.create(it)
4745
}
@@ -58,17 +56,9 @@ class ModelTrait : Trait("model") {
5856
}
5957
}
6058

61-
override fun onDespawn(reason: DespawnReason?) {
62-
onDespawn()
63-
}
64-
6559
override fun onRemove() {
6660
npc?.entity?.uniqueId?.let {
6761
BetterModel.registryOrNull(it)?.close()
6862
}
6963
}
70-
71-
override fun onRemove(reason: RemoveReason?) {
72-
onRemove()
73-
}
7464
}

0 commit comments

Comments
 (0)