Skip to content

Commit ed19571

Browse files
committed
Revert "queueExecuteAndWrapIotas: allow specifying continuation (#965)" (fix #967)
This reverts commit c64e5d7, reversing changes made to 22b7a6f. The changes made in #965 were meant to avoid any impact for addons, but we've since realized that adding an optional argument to a method still breaks mixins targeting that method. This caused a crash with HexxyInTheAlps and may also break other addons. While mixin impacts aren't technically breaking changes, we still don't really want to break an unknown number of addons this close to a release, so we'll resolve this issue by reverting #965 and revisiting this change at a later date.
1 parent b1c029b commit ed19571

File tree

1 file changed

+2
-4
lines changed
  • Common/src/main/java/at/petrak/hexcasting/api/casting/eval/vm

1 file changed

+2
-4
lines changed

Common/src/main/java/at/petrak/hexcasting/api/casting/eval/vm/CastingVM.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,9 @@ class CastingVM(var image: CastingImage, val env: CastingEnvironment) {
3838
*
3939
* Mutates this
4040
*/
41-
@JvmOverloads
42-
fun queueExecuteAndWrapIotas(iotas: List<Iota>, world: ServerLevel, nextContinuation: SpellContinuation = SpellContinuation.Done): ExecutionClientView {
41+
fun queueExecuteAndWrapIotas(iotas: List<Iota>, world: ServerLevel): ExecutionClientView {
4342
// Initialize the continuation stack to a single top-level eval for all iotas.
44-
// HACK: Ideally, we'd have a separate (SpellContinuation, ServerWorld) overload, but then 0.11.3 would cause mixins to break. Look into properly splitting this in 1.21?
45-
var continuation = if (iotas.isNotEmpty()) nextContinuation.pushFrame(FrameEvaluate(SpellList.LList(0, iotas), false)) else nextContinuation;
43+
var continuation = SpellContinuation.Done.pushFrame(FrameEvaluate(SpellList.LList(0, iotas), false))
4644
// Begin aggregating info
4745
val info = TempControllerInfo(earlyExit = false)
4846
var lastResolutionType = ResolvedPatternType.UNRESOLVED

0 commit comments

Comments
 (0)