Revert "5 minute upgrades for NPCs"

This reverts commit de772237c9.

src/engine/objects/Mob.java

@@ -1885,8 +1885,7 @@ public class Mob extends AbstractIntelligenceAgent {
                 if (!building.transferGold(-rankCost, false))
                     return;
 
-                //DateTime dateToUpgrade = DateTime.now().plusHours(Mob.getUpgradeTime(this));
+                DateTime dateToUpgrade = DateTime.now().plusHours(Mob.getUpgradeTime(this));
-                DateTime dateToUpgrade = DateTime.now().plusMinutes(5);
                 Mob.setUpgradeDateTime(this, dateToUpgrade);
 
                 // Schedule upgrade job

src/engine/objects/NPC.java

@@ -1325,8 +1325,7 @@ public class NPC extends AbstractCharacter {
                 if (!building.transferGold(-rankCost, false))
                     return;
 
-                //dateToUpgrade = DateTime.now().plusHours(this.getUpgradeTime());
+                dateToUpgrade = DateTime.now().plusHours(this.getUpgradeTime());
-                dateToUpgrade = DateTime.now().plusMinutes(5);
 
                 this.setUpgradeDateTime(dateToUpgrade);