  		public static bool dedServFPS = false;
  		public static int dedServCount1 = 0;
  		public static int dedServCount2 = 0;
+@@ -205,7 +_,7 @@
+ 		public static int dedServCount1 = 0;
+ 		public static int dedServCount2 = 0;
+ 		public static bool superFast = false;
+-		public static int MaxShopIDs = 22;
++		public static int MaxShopIDs = 22 + 1;
+ 		public static bool[] hairLoaded = new bool[134];
+ 		public static bool[] wingsLoaded = new bool[38];
+ 		public static bool[] goreLoaded = new bool[1087];
 @@ -469,7 +_,7 @@
  		private static bool flameRingLoaded;
  		private Texture2D flameRingTexture;

 		public static void InitLifeBytes()
 		{
 			NPC nPC = new NPC();
-			for (int i = -65; i < 547; i++)
+			for (int i = -65; i < NPCLoader.NPCCount; i++)
 			{
 				if (i != 0)

 			Main.dedServ = true;
 			Main.showSplash = false;
@@ -3486,13 +_,14 @@
				Lang.setLang(true);
 			}
 			Lang.setLang(false);
+			ModLoader.ModLoader.do_Load(null);
 			while (Main.worldPathName == null || Main.worldPathName == "")
 			{
