From 7fcfeed1c9ec1761128584bcdc83de4d5d5462d2 Mon Sep 17 00:00:00 2001
From: Chris Kearney <chris@kearneymail.com>
Date: Sun, 14 Aug 2016 22:03:03 -0700
Subject: [PATCH] red-eye bear spawn calm down

---
 src/main/java/com/comandante/creeper/player/Player.java | 1 +
 world/npcs/redeyedbear.json                             | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/comandante/creeper/player/Player.java b/src/main/java/com/comandante/creeper/player/Player.java
index 8836327e..4eea5fd5 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 18ad613d..a47dc5e9 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": [
-- 
GitLab