isaacscript-common 18.3.0 → 18.3.1

package/src/classes/callbacks/PostPickupCollect.ts

@@ -16,7 +16,7 @@ export class PostPickupCollect extends CustomCallback<ModCallbackCustom.POST_PIC
 
     this.callbacksUsed = [
       // 36
-      [ModCallback.POST_PICKUP_RENDER, [this.postPickupRender]],
+      [ModCallback.POST_PICKUP_RENDER, this.postPickupRender],
     ];
   }
 

package/src/classes/callbacks/PostPickupInitFirst.ts

@@ -17,7 +17,7 @@ export class PostPickupInitFirst extends CustomCallback<ModCallbackCustom.POST_P
 
     this.callbacksUsed = [
       // 34
-      [ModCallback.POST_PICKUP_INIT, [this.postPickupInit]],
+      [ModCallback.POST_PICKUP_INIT, this.postPickupInit],
     ];
   }
 

package/src/classes/callbacks/PostPickupInitLate.ts

@@ -15,7 +15,7 @@ export class PostPickupInitLate extends CustomCallback<ModCallbackCustom.POST_PI
 
     this.callbacksUsed = [
       // 35
-      [ModCallback.POST_PICKUP_UPDATE, [this.postPickupUpdate]],
+      [ModCallback.POST_PICKUP_UPDATE, this.postPickupUpdate],
     ];
   }
 

package/src/classes/callbacks/PostPickupStateChanged.ts

@@ -16,7 +16,7 @@ export class PostPickupStateChanged extends CustomCallback<ModCallbackCustom.POS
 
     this.callbacksUsed = [
       // 35
-      [ModCallback.POST_PICKUP_UPDATE, [this.postPickupUpdate]],
+      [ModCallback.POST_PICKUP_UPDATE, this.postPickupUpdate],
     ];
   }
 

package/src/classes/callbacks/PostPitRender.ts

@@ -10,7 +10,7 @@ export class PostPitRender extends CustomCallback<ModCallbackCustom.POST_PIT_REN
 
     this.callbacksUsed = [
       // 2
-      [ModCallback.POST_RENDER, [this.postRender]],
+      [ModCallback.POST_RENDER, this.postRender],
     ];
   }
 

package/src/classes/callbacks/PostPitUpdate.ts

@@ -10,7 +10,7 @@ export class PostPitUpdate extends CustomCallback<ModCallbackCustom.POST_PIT_UPD
 
     this.callbacksUsed = [
       // 1
-      [ModCallback.POST_UPDATE, [this.postUpdate]],
+      [ModCallback.POST_UPDATE, this.postUpdate],
     ];
   }
 

package/src/classes/callbacks/PostPlayerChangeHealth.ts

@@ -23,7 +23,7 @@ export class PostPlayerChangeHealth extends CustomCallback<ModCallbackCustom.POS
     this.customCallbacksUsed = [
       [
         ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
-        [this.postPEffectReordered],
+        this.postPEffectReordered,
       ],
     ];
   }

package/src/classes/callbacks/PostPlayerChangeStat.ts

@@ -29,7 +29,7 @@ export class PostPlayerChangeStat extends CustomCallback<ModCallbackCustom.POST_
     this.customCallbacksUsed = [
       [
         ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
-        [this.postPEffectReordered],
+        this.postPEffectReordered,
       ],
     ];
   }

package/src/classes/callbacks/PostPlayerChangeType.ts

@@ -26,7 +26,7 @@ export class PostPlayerChangeType extends CustomCallback<ModCallbackCustom.POST_
     this.customCallbacksUsed = [
       [
         ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
-        [this.postPEffectReordered],
+        this.postPEffectReordered,
       ],
     ];
   }

package/src/classes/callbacks/PostPlayerFatalDamage.ts

@@ -4,7 +4,6 @@ import {
   CollectibleType,
   DamageFlag,
   DamageFlagZero,
-  EntityType,
   ModCallback,
   UseFlag,
 } from "isaac-typescript-definitions";
@@ -36,33 +35,57 @@ export class PostPlayerFatalDamage extends CustomCallback<ModCallbackCustom.POST
     super();
 
     this.callbacksUsed = [
-      // 11
-      [
-        ModCallback.ENTITY_TAKE_DMG,
-        [this.entityTakeDmgPlayer, EntityType.PLAYER],
-      ],
-
       // 23
-      [ModCallback.PRE_USE_ITEM, [this.preUseItemBible, CollectibleType.BIBLE]],
+      [ModCallback.PRE_USE_ITEM, this.preUseItemBible, [CollectibleType.BIBLE]],
+    ];
+
+    this.customCallbacksUsed = [
+      [ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER, this.entityTakeDmgPlayer],
     ];
   }
 
   protected override shouldFire = shouldFirePlayer;
 
-  // ModCallback.ENTITY_TAKE_DMG (11)
-  // EntityType.PLAYER (1)
+  // ModCallback.PRE_USE_ITEM (23)
+  // CollectibleType.BIBLE (33)
+  private preUseItemBible = (
+    _collectibleType: CollectibleType,
+    _rng: RNG,
+    player: EntityPlayer,
+    _useFlags: BitFlags<UseFlag>,
+    _activeSlot: ActiveSlot,
+    _customVarData: int,
+  ): boolean | undefined => {
+    // Using The Bible on Satan is one of the few ways to die without taking damage, so we need to
+    // handle this case.
+    if (!inBossRoomOf(BossID.SATAN)) {
+      return undefined;
+    }
+
+    const shouldSustainDeath = this.fire(
+      player,
+      0,
+      DamageFlagZero,
+      EntityRef(player),
+      0,
+    );
+    if (shouldSustainDeath !== undefined) {
+      // End-users will return false to stop the damage from being fatal. We have to return true to
+      // prevent the Bible from firing.
+      return !shouldSustainDeath;
+    }
+
+    return undefined;
+  };
+
+  // ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER
   private entityTakeDmgPlayer = (
-    entity: Entity,
+    player: EntityPlayer,
     amount: float,
     damageFlags: BitFlags<DamageFlag>,
     source: EntityRef,
     countdownFrames: int,
   ): boolean | undefined => {
-    const player = entity.ToPlayer();
-    if (player === undefined) {
-      return undefined;
-    }
-
     // This callback should not trigger for the Strawman Keeper and other players that are "child"
     // players.
     if (isChildPlayer(player)) {
@@ -98,36 +121,4 @@ export class PostPlayerFatalDamage extends CustomCallback<ModCallbackCustom.POST
 
     return undefined;
   };
-
-  // ModCallback.PRE_USE_ITEM (23)
-  // CollectibleType.BIBLE (33)
-  private preUseItemBible = (
-    _collectibleType: CollectibleType,
-    _rng: RNG,
-    player: EntityPlayer,
-    _useFlags: BitFlags<UseFlag>,
-    _activeSlot: ActiveSlot,
-    _customVarData: int,
-  ): boolean | undefined => {
-    // Using The Bible on Satan is one of the few ways to die without taking damage, so we need to
-    // handle this case.
-    if (!inBossRoomOf(BossID.SATAN)) {
-      return undefined;
-    }
-
-    const shouldSustainDeath = this.fire(
-      player,
-      0,
-      DamageFlagZero,
-      EntityRef(player),
-      0,
-    );
-    if (shouldSustainDeath !== undefined) {
-      // End-users will return false to stop the damage from being fatal. We have to return true to
-      // prevent the Bible from firing.
-      return !shouldSustainDeath;
-    }
-
-    return undefined;
-  };
 }

package/src/classes/callbacks/PostPlayerInitFirst.ts

@@ -9,8 +9,8 @@ export class PostPlayerInitFirst extends CustomCallback<ModCallbackCustom.POST_P
     super();
 
     this.customCallbacksUsed = [
-      [ModCallbackCustom.POST_NEW_ROOM_REORDERED, [this.postNewRoomReordered]],
-      [ModCallbackCustom.POST_PLAYER_INIT_LATE, [this.postPlayerInitLate]],
+      [ModCallbackCustom.POST_NEW_ROOM_REORDERED, this.postNewRoomReordered],
+      [ModCallbackCustom.POST_PLAYER_INIT_LATE, this.postPlayerInitLate],
     ];
   }
 

package/src/classes/callbacks/PostPlayerInitLate.ts

@@ -20,7 +20,7 @@ export class PostPlayerInitLate extends CustomCallback<ModCallbackCustom.POST_PL
     this.customCallbacksUsed = [
       [
         ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
-        [this.postPEffectUpdateReordered],
+        this.postPEffectUpdateReordered,
       ],
     ];
   }

package/src/classes/callbacks/PostPoopRender.ts

@@ -10,7 +10,7 @@ export class PostPoopRender extends CustomCallback<ModCallbackCustom.POST_POOP_R
 
     this.callbacksUsed = [
       // 2
-      [ModCallback.POST_RENDER, [this.postRender]],
+      [ModCallback.POST_RENDER, this.postRender],
     ];
   }
 

package/src/classes/callbacks/PostPoopUpdate.ts

@@ -10,7 +10,7 @@ export class PostPoopUpdate extends CustomCallback<ModCallbackCustom.POST_POOP_U
 
     this.callbacksUsed = [
       // 1
-      [ModCallback.POST_UPDATE, [this.postUpdate]],
+      [ModCallback.POST_UPDATE, this.postUpdate],
     ];
   }
 

package/src/classes/callbacks/PostPressurePlateRender.ts

@@ -10,7 +10,7 @@ export class PostPressurePlateRender extends CustomCallback<ModCallbackCustom.PO
 
     this.callbacksUsed = [
       // 2
-      [ModCallback.POST_RENDER, [this.postRender]],
+      [ModCallback.POST_RENDER, this.postRender],
     ];
   }
 

package/src/classes/callbacks/PostPressurePlateUpdate.ts

@@ -10,7 +10,7 @@ export class PostPressurePlateUpdate extends CustomCallback<ModCallbackCustom.PO
 
     this.callbacksUsed = [
       // 1
-      [ModCallback.POST_UPDATE, [this.postUpdate]],
+      [ModCallback.POST_UPDATE, this.postUpdate],
     ];
   }
 

package/src/classes/callbacks/PostProjectileInitLate.ts

@@ -15,7 +15,7 @@ export class PostProjectileInitLate extends CustomCallback<ModCallbackCustom.POS
 
     this.callbacksUsed = [
       // 44
-      [ModCallback.POST_PROJECTILE_UPDATE, [this.postProjectileUpdate]],
+      [ModCallback.POST_PROJECTILE_UPDATE, this.postProjectileUpdate],
     ];
   }
 

package/src/classes/callbacks/PostPurchase.ts

@@ -29,7 +29,7 @@ export class PostPurchase extends CustomCallback<T> {
     this.customCallbacksUsed = [
       [
         ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
-        [this.postPEffectUpdateReordered],
+        this.postPEffectUpdateReordered,
       ],
     ];
   }

package/src/classes/callbacks/PostRockRender.ts

@@ -10,7 +10,7 @@ export class PostRockRender extends CustomCallback<ModCallbackCustom.POST_ROCK_R
 
     this.callbacksUsed = [
       // 2
-      [ModCallback.POST_RENDER, [this.postRender]],
+      [ModCallback.POST_RENDER, this.postRender],
     ];
   }
 

package/src/classes/callbacks/PostRockUpdate.ts

@@ -10,7 +10,7 @@ export class PostRockUpdate extends CustomCallback<ModCallbackCustom.POST_ROCK_U
 
     this.callbacksUsed = [
       // 1
-      [ModCallback.POST_UPDATE, [this.postUpdate]],
+      [ModCallback.POST_UPDATE, this.postUpdate],
     ];
   }
 

package/src/classes/callbacks/PostRoomClearChanged.ts

@@ -21,11 +21,11 @@ export class PostRoomClearChanged extends CustomCallback<T> {
 
     this.callbacksUsed = [
       // 1
-      [ModCallback.POST_UPDATE, [this.postUpdate]],
+      [ModCallback.POST_UPDATE, this.postUpdate],
     ];
 
     this.customCallbacksUsed = [
-      [ModCallbackCustom.POST_NEW_ROOM_REORDERED, [this.postNewRoomReordered]],
+      [ModCallbackCustom.POST_NEW_ROOM_REORDERED, this.postNewRoomReordered],
     ];
   }
 

package/src/classes/callbacks/PostSacrifice.ts

@@ -1,9 +1,4 @@
-import {
-  DamageFlag,
-  EntityType,
-  ModCallback,
-  RoomType,
-} from "isaac-typescript-definitions";
+import { DamageFlag, RoomType } from "isaac-typescript-definitions";
 import { game } from "../../core/cachedClasses";
 import { ModCallbackCustom } from "../../enums/ModCallbackCustom";
 import { hasFlag } from "../../functions/flag";
@@ -20,31 +15,21 @@ export class PostSacrifice extends CustomCallback<ModCallbackCustom.POST_SACRIFI
   constructor() {
     super();
 
-    this.callbacksUsed = [
-      // 11
-      [
-        ModCallback.ENTITY_TAKE_DMG,
-        [this.entityTakeDmgPlayer, EntityType.PLAYER],
-      ],
+    this.customCallbacksUsed = [
+      [ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER, this.entityTakeDmgPlayer],
     ];
   }
 
   protected override shouldFire = shouldFirePlayer;
 
-  // ModCallback.ENTITY_TAKE_DMG (11)
-  // EntityType.PLAYER (1)
+  // ModCallbackCustom.ENTITY_TAKE_DMG
   private entityTakeDmgPlayer = (
-    entity: Entity,
+    player: EntityPlayer,
     _amount: float,
     damageFlags: BitFlags<DamageFlag>,
     _source: EntityRef,
     _countdownFrames: int,
   ): boolean | undefined => {
-    const player = entity.ToPlayer();
-    if (player === undefined) {
-      return undefined;
-    }
-
     const room = game.GetRoom();
     const roomType = room.GetType();
     const isSpikeDamage = hasFlag(damageFlags, DamageFlag.SPIKES);

package/src/classes/callbacks/PostSlotCollision.ts

@@ -10,7 +10,7 @@ export class PostSlotCollision extends CustomCallback<ModCallbackCustom.POST_SLO
 
     this.callbacksUsed = [
       // 33
-      [ModCallback.PRE_PLAYER_COLLISION, [this.prePlayerCollision]],
+      [ModCallback.PRE_PLAYER_COLLISION, this.prePlayerCollision],
     ];
   }
 

package/src/classes/callbacks/PostSlotDestroyed.ts

@@ -26,14 +26,15 @@ export class PostSlotDestroyed extends CustomCallback<ModCallbackCustom.POST_SLO
       // 67
       [
         ModCallback.POST_ENTITY_REMOVE,
-        [this.postEntityRemoveSlot, EntityType.SLOT],
+        this.postEntityRemoveSlot,
+        [EntityType.SLOT],
       ],
     ];
 
     this.customCallbacksUsed = [
       [
         ModCallbackCustom.POST_SLOT_ANIMATION_CHANGED,
-        [this.postSlotAnimationChanged],
+        this.postSlotAnimationChanged,
       ],
     ];
   }

package/src/classes/callbacks/PostSpikesRender.ts

@@ -10,7 +10,7 @@ export class PostSpikesRender extends CustomCallback<ModCallbackCustom.POST_SPIK
 
     this.callbacksUsed = [
       // 2
-      [ModCallback.POST_RENDER, [this.postRender]],
+      [ModCallback.POST_RENDER, this.postRender],
     ];
   }
 

package/src/classes/callbacks/PostSpikesUpdate.ts

@@ -10,7 +10,7 @@ export class PostSpikesUpdate extends CustomCallback<ModCallbackCustom.POST_SPIK
 
     this.callbacksUsed = [
       // 1
-      [ModCallback.POST_UPDATE, [this.postUpdate]],
+      [ModCallback.POST_UPDATE, this.postUpdate],
     ];
   }
 

package/src/classes/callbacks/PostTNTRender.ts

@@ -10,7 +10,7 @@ export class PostTNTRender extends CustomCallback<ModCallbackCustom.POST_TNT_REN
 
     this.callbacksUsed = [
       // 2
-      [ModCallback.POST_RENDER, [this.postRender]],
+      [ModCallback.POST_RENDER, this.postRender],
     ];
   }
 

package/src/classes/callbacks/PostTNTUpdate.ts

@@ -10,7 +10,7 @@ export class PostTNTUpdate extends CustomCallback<ModCallbackCustom.POST_TNT_UPD
 
     this.callbacksUsed = [
       // 1
-      [ModCallback.POST_UPDATE, [this.postUpdate]],
+      [ModCallback.POST_UPDATE, this.postUpdate],
     ];
   }
 

package/src/classes/callbacks/PostTearInitLate.ts

@@ -15,7 +15,7 @@ export class PostTearInitLate extends CustomCallback<ModCallbackCustom.POST_TEAR
 
     this.callbacksUsed = [
       // 40
-      [ModCallback.POST_TEAR_UPDATE, [this.postTearUpdate]],
+      [ModCallback.POST_TEAR_UPDATE, this.postTearUpdate],
     ];
   }
 

package/src/classes/callbacks/PostTearInitVeryLate.ts

@@ -15,7 +15,7 @@ export class PostTearInitVeryLate extends CustomCallback<ModCallbackCustom.POST_
 
     this.callbacksUsed = [
       // 40
-      [ModCallback.POST_TEAR_UPDATE, [this.postTearUpdate]],
+      [ModCallback.POST_TEAR_UPDATE, this.postTearUpdate],
     ];
   }
 

package/src/classes/callbacks/PostTransformation.ts

@@ -29,7 +29,7 @@ export class PostTransformation extends CustomCallback<T> {
     this.customCallbacksUsed = [
       [
         ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
-        [this.postPEffectUpdateReordered],
+        this.postPEffectUpdateReordered,
       ],
     ];
   }

package/src/classes/callbacks/PostTrinketBreak.ts

@@ -1,7 +1,6 @@
 import {
   DamageFlag,
   EntityType,
-  ModCallback,
   PickupVariant,
   TrinketType,
 } from "isaac-typescript-definitions";
@@ -30,38 +29,25 @@ export class PostTrinketBreak extends CustomCallback<ModCallbackCustom.POST_TRIN
   constructor() {
     super();
 
-    this.callbacksUsed = [
-      // 11
-      [
-        ModCallback.ENTITY_TAKE_DMG,
-        [this.entityTakeDmgPlayer, EntityType.PLAYER],
-      ],
-    ];
-
     this.customCallbacksUsed = [
+      [ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER, this.entityTakeDmgPlayer],
       [
         ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
-        [this.postPEffectUpdateReordered],
+        this.postPEffectUpdateReordered,
       ],
     ];
   }
 
   protected override shouldFire = shouldFireTrinketType;
 
-  // ModCallback.ENTITY_TAKE_DMG (11)
-  // EntityType.PLAYER (1)
+  // ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER
   private entityTakeDmgPlayer = (
-    entity: Entity,
+    player: EntityPlayer,
     _amount: float,
     _damageFlags: BitFlags<DamageFlag>,
     _source: EntityRef,
     _countdownFrames: int,
   ): boolean | undefined => {
-    const player = entity.ToPlayer();
-    if (player === undefined) {
-      return undefined;
-    }
-
     const trinketMap = defaultMapGetPlayer(
       this.v.run.playersTrinketMap,
       player,

package/src/classes/callbacks/PreBerserkDeath.ts

@@ -13,7 +13,7 @@ export class PreBerserkDeath extends CustomCallback<ModCallbackCustom.PRE_BERSER
     this.customCallbacksUsed = [
       [
         ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
-        [this.postPEffectUpdateReordered],
+        this.postPEffectUpdateReordered,
       ],
     ];
   }

package/src/classes/callbacks/PreGetPedestal.ts

@@ -15,7 +15,8 @@ export class PreGetPedestal extends CustomCallback<ModCallbackCustom.PRE_GET_PED
       // 38
       [
         ModCallback.PRE_PICKUP_COLLISION,
-        [this.prePickupCollision, PickupVariant.COLLECTIBLE],
+        this.prePickupCollision,
+        [PickupVariant.COLLECTIBLE],
       ],
     ];
   }

package/src/classes/callbacks/PreNPCCollisionFilter.ts

@@ -9,7 +9,7 @@ export class PreNPCCollisionFilter extends CustomCallback<ModCallbackCustom.PRE_
 
     this.callbacksUsed = [
       // 30
-      [ModCallback.PRE_NPC_COLLISION, [this.preNPCCollision]],
+      [ModCallback.PRE_NPC_COLLISION, this.preNPCCollision],
     ];
   }
 

package/src/classes/callbacks/PreNPCUpdateFilter.ts

@@ -9,7 +9,7 @@ export class PreNPCUpdateFilter extends CustomCallback<ModCallbackCustom.PRE_NPC
 
     this.callbacksUsed = [
       // 69
-      [ModCallback.PRE_NPC_UPDATE, [this.preNPCUpdate]],
+      [ModCallback.PRE_NPC_UPDATE, this.preNPCUpdate],
     ];
   }
 

package/src/classes/callbacks/PreNewLevel.ts

@@ -21,7 +21,7 @@ export class PreNewLevel extends CustomCallback<ModCallbackCustom.PRE_NEW_LEVEL>
 
     this.callbacksUsed = [
       // 32
-      [ModCallback.POST_PLAYER_RENDER, [this.postPlayerRender]],
+      [ModCallback.POST_PLAYER_RENDER, this.postPlayerRender],
     ];
   }
 

package/src/classes/features/callbackLogic/CustomGridEntities.ts

@@ -48,14 +48,16 @@ export class CustomGridEntities extends Feature {
     this.featuresUsed = [ISCFeature.RUN_IN_N_FRAMES];
 
     this.callbacksUsed = [
+      // 23
       [
         ModCallback.PRE_USE_ITEM,
-        [this.preUseItemWeNeedToGoDeeper, CollectibleType.WE_NEED_TO_GO_DEEPER],
-      ], // 23
+        this.preUseItemWeNeedToGoDeeper,
+        [CollectibleType.WE_NEED_TO_GO_DEEPER],
+      ],
     ];
 
     this.customCallbacksUsed = [
-      [ModCallbackCustom.POST_NEW_ROOM_REORDERED, [this.postNewRoomReordered]],
+      [ModCallbackCustom.POST_NEW_ROOM_REORDERED, this.postNewRoomReordered],
     ];
 
     this.runInNFrames = runInNFrames;

package/src/classes/features/callbackLogic/CustomRevive.ts

@@ -60,17 +60,18 @@ export class CustomRevive extends Feature {
     this.featuresUsed = [ISCFeature.RUN_IN_N_FRAMES];
 
     this.callbacksUsed = [
-      [ModCallback.POST_RENDER, [this.postRender]], // 2
-      [ModCallback.POST_PEFFECT_UPDATE, [this.postPEffectUpdate]], // 4
+      // 2
+      [ModCallback.POST_RENDER, this.postRender],
     ];
 
     this.customCallbacksUsed = [
-      [ModCallbackCustom.POST_NEW_ROOM_REORDERED, [this.postNewRoomReordered]],
+      [ModCallbackCustom.POST_NEW_ROOM_REORDERED, this.postNewRoomReordered],
       [
-        ModCallbackCustom.POST_PLAYER_FATAL_DAMAGE,
-        [this.postPlayerFatalDamage],
+        ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
+        this.postPEffectUpdateReordered,
       ],
-      [ModCallbackCustom.PRE_BERSERK_DEATH, [this.preBerserkDeath]],
+      [ModCallbackCustom.POST_PLAYER_FATAL_DAMAGE, this.postPlayerFatalDamage],
+      [ModCallbackCustom.PRE_BERSERK_DEATH, this.preBerserkDeath],
     ];
 
     this.preCustomRevive = preCustomRevive;
@@ -89,8 +90,18 @@ export class CustomRevive extends Feature {
     sfxManager.Stop(SoundEffect.ONE_UP);
   };
 
-  // ModCallback.POST_PEFFECT_UPDATE (4)
-  private postPEffectUpdate = (player: EntityPlayer): void => {
+  // ModCallbackCustom.POST_NEW_ROOM_REORDERED
+  private postNewRoomReordered = (): void => {
+    if (this.v.run.state !== CustomReviveState.WAITING_FOR_ROOM_TRANSITION) {
+      return;
+    }
+
+    this.v.run.state = CustomReviveState.WAITING_FOR_ITEM_ANIMATION;
+    this.logStateChanged();
+  };
+
+  // ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED
+  private postPEffectUpdateReordered = (player: EntityPlayer): void => {
     this.checkWaitingForItemAnimation(player);
   };
 
@@ -138,16 +149,6 @@ export class CustomRevive extends Feature {
     this.logStateChanged();
   }
 
-  // ModCallbackCustom.POST_NEW_ROOM_REORDERED
-  private postNewRoomReordered = (): void => {
-    if (this.v.run.state !== CustomReviveState.WAITING_FOR_ROOM_TRANSITION) {
-      return;
-    }
-
-    this.v.run.state = CustomReviveState.WAITING_FOR_ITEM_ANIMATION;
-    this.logStateChanged();
-  };
-
   // ModCallbackCustom.POST_PLAYER_FATAL_DAMAGE
   private postPlayerFatalDamage = (
     player: EntityPlayer,