diff --git a/src/main/java/com/comandante/creeper/player/Player.java b/src/main/java/com/comandante/creeper/player/Player.java index 8836327efc102ff2a238a95e4c5f30b4a5bd1734..4eea5fd54e5b3299b6a67e78410ab95b41dfc9ae 100644 --- a/src/main/java/com/comandante/creeper/player/Player.java +++ b/src/main/java/com/comandante/creeper/player/Player.java @@ -1042,6 +1042,7 @@ public class Player extends CreeperEntity { } private void doFightRound(ActiveFight activeFight) { + removeActiveAlertStatus(); Npc npc = gameManager.getEntityManager().getNpcEntity(activeFight.getNpcId()); if (npc == null) { return; diff --git a/world/npcs/redeyedbear.json b/world/npcs/redeyedbear.json index 18ad613dbfa99cf33e46d6193b57b5b21eb09885..a47dc5e9986b74bd602e438f8ca0e30d406261c5 100644 --- a/world/npcs/redeyedbear.json +++ b/world/npcs/redeyedbear.json @@ -34,13 +34,13 @@ "randomChance": 100, "maxPerRoom": 1, "spawnIntervalTicks": 600, - "maxInstances": 22 + "maxInstances": 12 }, "toft2_zone": { "randomChance": 100, "maxPerRoom": 1, "spawnIntervalTicks": 600, - "maxInstances": 22 + "maxInstances": 12 } }, "validTriggers": [