Skip to content

Commit 53e5a0b

Browse files
committed
removed player bitmap component of _checkForAggro
1 parent f77f4cf commit 53e5a0b

1 file changed

Lines changed: 2 additions & 11 deletions

File tree

src/battle-nads/Instances.sol

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,8 @@ abstract contract Instances is Combat {
4747
// Boss has a reserved index.
4848
if (isBossEncounter) {
4949
uint256 bossBit = 1 << RESERVED_BOSS_INDEX;
50-
uint256 combinedBossCheck = (monsterBitmap | playerBitmap) & bossBit;
51-
52-
if (combinedBossCheck != 0) {
53-
// Boss index is occupied by either a monster or player
54-
// Check if it's a monster that can be loaded
55-
if (monsterBitmap & bossBit != 0) {
56-
return (uint8(RESERVED_BOSS_INDEX), false);
57-
} else {
58-
// Player is occupying boss slot, can't spawn boss
59-
return (0, false);
60-
}
50+
if (monsterBitmap & bossBit != 0) {
51+
return (uint8(RESERVED_BOSS_INDEX), false);
6152
} else {
6253
return (uint8(RESERVED_BOSS_INDEX), true);
6354
}

0 commit comments

Comments
 (0)