isaacscript-common 1.0.589 → 1.0.590
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -18,7 +18,7 @@ local postPlayerFatalDamageHasSubscriptions = ____postPlayerFatalDamage.postPlay
|
|
|
18
18
|
function hasSubscriptions(self)
|
|
19
19
|
return postPlayerFatalDamageHasSubscriptions(nil)
|
|
20
20
|
end
|
|
21
|
-
function entityTakeDmgPlayer(self, tookDamage, damageAmount, _damageFlags,
|
|
21
|
+
function entityTakeDmgPlayer(self, tookDamage, damageAmount, _damageFlags, damageSource, _damageCountdownFrames)
|
|
22
22
|
if not hasSubscriptions(nil) then
|
|
23
23
|
return nil
|
|
24
24
|
end
|
|
@@ -34,12 +34,16 @@ function entityTakeDmgPlayer(self, tookDamage, damageAmount, _damageFlags, _dama
|
|
|
34
34
|
end
|
|
35
35
|
local game = Game()
|
|
36
36
|
local gameFrameCount = game:GetFrameCount()
|
|
37
|
+
local character = player:GetPlayerType()
|
|
37
38
|
local playerIndex = getPlayerIndex(nil, player)
|
|
38
39
|
local lastDamageFrame = v.run.playerLastDamageFrame:get(playerIndex)
|
|
39
40
|
v.run.playerLastDamageFrame:set(playerIndex, gameFrameCount)
|
|
40
41
|
if willPlayerRevive(nil, player) then
|
|
41
42
|
return nil
|
|
42
43
|
end
|
|
44
|
+
if character == PlayerType.PLAYER_JACOB_B and damageSource.Type == EntityType.ENTITY_DARK_ESAU then
|
|
45
|
+
return nil
|
|
46
|
+
end
|
|
43
47
|
if not damageIsFatal(nil, player, damageAmount, lastDamageFrame) and not hasLostCurse(nil, player) then
|
|
44
48
|
return nil
|
|
45
49
|
end
|