From c1d4ce726173077d8b073333cee19d842fba4907 Mon Sep 17 00:00:00 2001
From: Jason A Cramer <jason.cramer@uconn.edu>
Date: Fri, 26 Mar 2021 15:34:46 -0400
Subject: [PATCH] Update CastleSiegeEvents.java

---
 .../castlesiege/events/CastleSiegeEvents.java | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/com/cramer/castlesiege/events/CastleSiegeEvents.java b/src/com/cramer/castlesiege/events/CastleSiegeEvents.java
index 4c4021e..dbb653c 100644
--- a/src/com/cramer/castlesiege/events/CastleSiegeEvents.java
+++ b/src/com/cramer/castlesiege/events/CastleSiegeEvents.java
@@ -61,9 +61,18 @@ public void onPlayerJoin(PlayerJoinEvent e)
         o.setDisplayName(ChatColor.DARK_GREEN + "Zombie Siege");
 
         Score mobCount = o.getScore("Zombies:");
-        mobCount.setScore(CastleSiege.totalMobs);
         Score villagerCount = o.getScore("Villagers:");
-        villagerCount.setScore(CastleSiege.totalVillagers);
+
+        if (CastleSiege.siegeOngoing)
+        {
+            mobCount.setScore(CastleSiege.totalMobs);
+            villagerCount.setScore(CastleSiege.totalVillagers);
+        }
+        else
+        {
+            mobCount.setScore(0);
+            villagerCount.setScore(12);
+        }
 
         p.setScoreboard(b);
     }
@@ -72,19 +81,18 @@ public void onPlayerJoin(PlayerJoinEvent e)
     @EventHandler
     public void onEntityDeath(EntityDeathEvent e)
     {
-        if (e.getEntityType() != EntityType.PLAYER)
-        {
-            if (e.getEntityType() == EntityType.VILLAGER) {
-                CastleSiege.totalVillagers -= 1;
-            }
-            else {
-                CastleSiege.totalMobs -= 1;
-                if (e.getEntity().getEquipment().getHelmet().getType() == Material.WITHER_SKELETON_SKULL)
-                {
-                    CastleSiege.WinGame();
+        if (CastleSiege.siegeOngoing) {
+            if (e.getEntityType() != EntityType.PLAYER) {
+                if (e.getEntityType() == EntityType.VILLAGER) {
+                    CastleSiege.totalVillagers -= 1;
+                } else {
+                    CastleSiege.totalMobs -= 1;
+                    if (e.getEntity().getEquipment().getHelmet().getType() == Material.WITHER_SKELETON_SKULL) {
+                        CastleSiege.WinGame();
+                    }
                 }
+                CastleSiege.UpdateScore();
             }
-            CastleSiege.UpdateScore();
         }
     }