diff --git a/Common/src/main/java/at/petrak/hexcasting/api/casting/eval/CastingEnvironment.java b/Common/src/main/java/at/petrak/hexcasting/api/casting/eval/CastingEnvironment.java index d6689d715..00789ac46 100644 --- a/Common/src/main/java/at/petrak/hexcasting/api/casting/eval/CastingEnvironment.java +++ b/Common/src/main/java/at/petrak/hexcasting/api/casting/eval/CastingEnvironment.java @@ -78,6 +78,10 @@ public final ServerLevel getWorld() { return this.world; } + public int maxOpCount() { + return HexConfig.server().maxOpCount(); + } + /** * Get the caster. Might be null! *

diff --git a/Common/src/main/java/at/petrak/hexcasting/api/casting/iota/PatternIota.java b/Common/src/main/java/at/petrak/hexcasting/api/casting/iota/PatternIota.java index b7b6e2c94..6a3ec539d 100644 --- a/Common/src/main/java/at/petrak/hexcasting/api/casting/iota/PatternIota.java +++ b/Common/src/main/java/at/petrak/hexcasting/api/casting/iota/PatternIota.java @@ -106,7 +106,7 @@ public boolean toleratesOther(Iota that) { continuation ); - if (result.getNewImage().getOpsConsumed() > HexConfig.server().maxOpCount()) { + if (result.getNewImage().getOpsConsumed() > vm.getEnv().maxOpCount()) { throw new MishapEvalTooMuch(); } diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/eval/OpThanos.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/eval/OpThanos.kt index 680808c83..075fa90a2 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/eval/OpThanos.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/eval/OpThanos.kt @@ -11,7 +11,7 @@ import at.petrak.hexcasting.common.lib.hex.HexEvalSounds object OpThanos : Action { override fun operate(env: CastingEnvironment, image: CastingImage, continuation: SpellContinuation): OperationResult { - val opsLeft = HexConfig.server().maxOpCount() - image.opsConsumed + val opsLeft = env.maxOpCount() - image.opsConsumed val stack = image.stack.toMutableList() stack.add(DoubleIota(opsLeft.toDouble()))