isaacscript-common 17.0.0 → 17.0.1

package/dist/index.d.ts

@@ -11387,7 +11387,6 @@ declare class Pause extends Feature {
 declare class PersistentEntities extends Feature {
     private roomHistory;
     private postEntityRemove;
-    private checkDespawningFromPlayerLeavingRoom;
     /**
      * The persistent entity is despawning because the player is in the process of leaving the room.
      * Keep track of the position for later.

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 17.0.0
+isaacscript-common 17.0.1
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -46619,7 +46619,17 @@ function PersistentEntities.prototype.____constructor(self, roomHistory)
         room = {spawnedPersistentEntities = __TS__New(Map)}
     }
     self.postEntityRemove = function(____, entity)
-        self:checkDespawningFromPlayerLeavingRoom(entity)
+        local ptrHash = GetPtrHash(entity)
+        local tuple = self.v.room.spawnedPersistentEntities:get(ptrHash)
+        if tuple == nil then
+            return
+        end
+        local index = tuple[1]
+        if self.roomHistory:isLeavingRoom() then
+            self:trackDespawningPickupPosition(entity, index)
+        else
+            self:removePersistentEntity(index, false)
+        end
     end
     self.postNewRoomReordered = function()
         local roomListIndex = getRoomListIndex(nil)
@@ -46652,18 +46662,6 @@ function PersistentEntities.prototype.____constructor(self, roomHistory)
     self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_ROOM_REORDERED, {self.postNewRoomReordered}}}
     self.roomHistory = roomHistory
 end
-function PersistentEntities.prototype.checkDespawningFromPlayerLeavingRoom(self, entity)
-    local ptrHash = GetPtrHash(entity)
-    local tuple = self.v.room.spawnedPersistentEntities:get(ptrHash)
-    if tuple == nil then
-        return
-    end
-    local index = tuple[1]
-    if not self.roomHistory:isLeavingRoom() then
-        return
-    end
-    self:trackDespawningPickupPosition(entity, index)
-end
 function PersistentEntities.prototype.trackDespawningPickupPosition(self, entity, index)
     local previousRoomDescription = self.roomHistory:getLatestRoomDescription()
     if previousRoomDescription == nil then

package/dist/src/classes/features/other/PersistentEntities.d.ts

@@ -3,7 +3,6 @@ import { Feature } from "../../private/Feature";
 export declare class PersistentEntities extends Feature {
     private roomHistory;
     private postEntityRemove;
-    private checkDespawningFromPlayerLeavingRoom;
     /**
      * The persistent entity is despawning because the player is in the process of leaving the room.
      * Keep track of the position for later.

package/dist/src/classes/features/other/PersistentEntities.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PersistentEntities.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/other/PersistentEntities.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,UAAU,EAEX,MAAM,8BAA8B,CAAC;AAMtC,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAchD,qBAAa,kBAAmB,SAAQ,OAAO;IAuB7C,OAAO,CAAC,WAAW,CAAc;IAoBjC,OAAO,CAAC,gBAAgB,CAEtB;IAEF,OAAO,CAAC,oCAAoC;IAe5C;;;OAGG;IACH,OAAO,CAAC,6BAA6B;IAoBrC,OAAO,CAAC,oBAAoB,CAkB1B;IAEF,OAAO,CAAC,aAAa;IAsBrB;;;;;;;;;;;OAWG;IAEI,sBAAsB,CAC3B,qBAAqB,EAAE,GAAG,EAC1B,YAAY,UAAO,GAClB,IAAI;IAoBP;;;;;;;;;;;;;;;;;OAiBG;IAEI,qBAAqB,CAC1B,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,GAAG,EACZ,QAAQ,EAAE,MAAM,GACf,CAAC,MAAM,EAAE,GAAG,CAAC;CAajB"}
+{"version":3,"file":"PersistentEntities.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/other/PersistentEntities.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,UAAU,EAEX,MAAM,8BAA8B,CAAC;AAMtC,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAchD,qBAAa,kBAAmB,SAAQ,OAAO;IAuB7C,OAAO,CAAC,WAAW,CAAc;IAoBjC,OAAO,CAAC,gBAAgB,CAgBtB;IAEF;;;OAGG;IACH,OAAO,CAAC,6BAA6B;IAoBrC,OAAO,CAAC,oBAAoB,CAkB1B;IAEF,OAAO,CAAC,aAAa;IAsBrB;;;;;;;;;;;OAWG;IAEI,sBAAsB,CAC3B,qBAAqB,EAAE,GAAG,EAC1B,YAAY,UAAO,GAClB,IAAI;IAoBP;;;;;;;;;;;;;;;;;OAiBG;IAEI,qBAAqB,CAC1B,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,GAAG,EACZ,QAAQ,EAAE,MAAM,GACf,CAAC,MAAM,EAAE,GAAG,CAAC;CAajB"}

package/dist/src/classes/features/other/PersistentEntities.lua

@@ -35,7 +35,17 @@ function PersistentEntities.prototype.____constructor(self, roomHistory)
         room = {spawnedPersistentEntities = __TS__New(Map)}
     }
     self.postEntityRemove = function(____, entity)
-        self:checkDespawningFromPlayerLeavingRoom(entity)
+        local ptrHash = GetPtrHash(entity)
+        local tuple = self.v.room.spawnedPersistentEntities:get(ptrHash)
+        if tuple == nil then
+            return
+        end
+        local index = tuple[1]
+        if self.roomHistory:isLeavingRoom() then
+            self:trackDespawningPickupPosition(entity, index)
+        else
+            self:removePersistentEntity(index, false)
+        end
     end
     self.postNewRoomReordered = function()
         local roomListIndex = getRoomListIndex(nil)
@@ -68,18 +78,6 @@ function PersistentEntities.prototype.____constructor(self, roomHistory)
     self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_ROOM_REORDERED, {self.postNewRoomReordered}}}
     self.roomHistory = roomHistory
 end
-function PersistentEntities.prototype.checkDespawningFromPlayerLeavingRoom(self, entity)
-    local ptrHash = GetPtrHash(entity)
-    local tuple = self.v.room.spawnedPersistentEntities:get(ptrHash)
-    if tuple == nil then
-        return
-    end
-    local index = tuple[1]
-    if not self.roomHistory:isLeavingRoom() then
-        return
-    end
-    self:trackDespawningPickupPosition(entity, index)
-end
 function PersistentEntities.prototype.trackDespawningPickupPosition(self, entity, index)
     local previousRoomDescription = self.roomHistory:getLatestRoomDescription()
     if previousRoomDescription == nil then

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "17.0.0",
+  "version": "17.0.1",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",

package/src/classes/features/other/PersistentEntities.ts

@@ -67,23 +67,22 @@ export class PersistentEntities extends Feature {
 
   // ModCallback.POST_ENTITY_REMOVE (67)
   private postEntityRemove = (entity: Entity) => {
-    this.checkDespawningFromPlayerLeavingRoom(entity);
-  };
-
-  private checkDespawningFromPlayerLeavingRoom(entity: Entity) {
     const ptrHash = GetPtrHash(entity);
     const tuple = this.v.room.spawnedPersistentEntities.get(ptrHash);
     if (tuple === undefined) {
       return;
     }
+
+    // A persistent entity is being removed, either because it was killed / manually despawned, or
+    // the player left the room.
     const index = tuple[0];
 
-    if (!this.roomHistory.isLeavingRoom()) {
-      return;
+    if (this.roomHistory.isLeavingRoom()) {
+      this.trackDespawningPickupPosition(entity, index);
+    } else {
+      this.removePersistentEntity(index, false);
     }
-
-    this.trackDespawningPickupPosition(entity, index);
-  }
+  };
 
   /**
    * The persistent entity is despawning because the player is in the process of leaving the room.