Merge pull request #613 from Talia-12/environment-max-ops

Make maxOpCount an Environment configurable value.
FallingColors · Feb 8, 2024 · 4181848 · 4181848
2 parents b0a8530 + f902c69
commit 4181848
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
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
@@ -78,6 +78,10 @@ public final ServerLevel getWorld() {
  return this.world;
  }
 
+ public int maxOpCount() {
+ return HexConfig.server().maxOpCount();
+ }
+
  /**
  * Get the caster. Might be null!
  * <p>

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
@@ -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
@@ -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()))