Further fix patch to use nextRoom rather than currentRoom

dbjorge · Apr 7, 2020 · 93f5047 · 93f5047
1 parent 245e9fc
commit 93f5047
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/main/java/stsjorbsmod/patches/ManifestPatch.java b/src/main/java/stsjorbsmod/patches/ManifestPatch.java
@@ -68,11 +68,8 @@ public static void updateFloorNumPatch(AbstractDungeon __this, SaveFile saveFile
             if (AbstractDungeon.player != null) {
                 __this.floorNum += PlayerManifestField.manifestField.get(AbstractDungeon.player);
 
-                int startingManifest =
-                        (AbstractDungeon.player != null && AbstractDungeon.player instanceof Cull &&
-                        __this.currMapNode != null && __this.currMapNode.room instanceof EventRoom) ?
-                                1 :
-                                0;
+                boolean nextRoomIsEvent = __this.nextRoom != null && __this.nextRoom.room instanceof EventRoom;
+                int startingManifest = (nextRoomIsEvent && AbstractDungeon.player instanceof Cull) ? 1 : 0;
                 PlayerManifestField.manifestField.set(AbstractDungeon.player, startingManifest);
             }
         }