change playerless sentinel check to check for a player and not just a…

…n entity
FallingColors · Nov 5, 2024 · eafa509 · eafa509
1 parent 92b668f
commit eafa509
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/...main/java/at/petrak/hexcasting/common/casting/actions/spells/sentinel/OpCreateSentinel.kt b/...main/java/at/petrak/hexcasting/common/casting/actions/spells/sentinel/OpCreateSentinel.kt
@@ -20,7 +20,7 @@ class OpCreateSentinel(val extendsRange: Boolean) : SpellAction {
             args: List<Iota>,
             env: CastingEnvironment
     ): SpellAction.Result {
-        if (env.castingEntity == null)
+        if (env.castingEntity !is ServerPlayer)
             throw MishapBadCaster()
 
         val target = args.getVec3(0, argc)

diff --git a/...ain/java/at/petrak/hexcasting/common/casting/actions/spells/sentinel/OpDestroySentinel.kt b/...ain/java/at/petrak/hexcasting/common/casting/actions/spells/sentinel/OpDestroySentinel.kt
@@ -17,7 +17,7 @@ object OpDestroySentinel : SpellAction {
             args: List<Iota>,
             env: CastingEnvironment
     ): SpellAction.Result {
-        if (env.castingEntity == null)
+        if (env.castingEntity !is ServerPlayer)
             throw MishapBadCaster()
 
         val sentinel = IXplatAbstractions.INSTANCE.getSentinel(env.castingEntity as? ServerPlayer)

diff --git a/...main/java/at/petrak/hexcasting/common/casting/actions/spells/sentinel/OpGetSentinelPos.kt b/...main/java/at/petrak/hexcasting/common/casting/actions/spells/sentinel/OpGetSentinelPos.kt
@@ -15,7 +15,7 @@ object OpGetSentinelPos : ConstMediaAction {
     override val argc = 0
     override val mediaCost: Long = MediaConstants.DUST_UNIT / 10
     override fun execute(args: List<Iota>, env: CastingEnvironment): List<Iota> {
-        if (env.castingEntity == null)
+        if (env.castingEntity !is ServerPlayer)
             throw MishapBadCaster()
 
         val sentinel = IXplatAbstractions.INSTANCE.getSentinel(env.castingEntity as? ServerPlayer) ?: return listOf(NullIota())

diff --git a/.../java/at/petrak/hexcasting/common/casting/actions/spells/sentinel/OpGetSentinelWayfind.kt b/.../java/at/petrak/hexcasting/common/casting/actions/spells/sentinel/OpGetSentinelWayfind.kt
@@ -18,7 +18,7 @@ object OpGetSentinelWayfind : ConstMediaAction {
     override val argc = 1
     override val mediaCost: Long = MediaConstants.DUST_UNIT / 10
     override fun execute(args: List<Iota>, env: CastingEnvironment): List<Iota> {
-        if (env.castingEntity == null)
+        if (env.castingEntity !is ServerPlayer)
             throw MishapBadCaster()
 
         val from = args.getVec3(0, argc)