Index: petutils.cpp
===================================================================
--- petutils.cpp	(revision 3050)
+++ petutils.cpp	(working copy)
@@ -568,27 +568,9 @@
 		LoadJugStats(PPet, g_PPetList.at(PetID)); //follow monster calcs (w/o SJ)
 	}
 	else if(PPet->getPetType()==PETTYPE_WYVERN){
-		//set the wyvern job based on master's SJ
-		if(PMaster->GetSJob()!=NULL){
-			switch(PMaster->GetSJob()){
-				//defensive
-			case JOB_WHM:
-			case JOB_BLM:
-			case JOB_RDM:
-			case JOB_BLU:
-			case JOB_SMN:
-			case JOB_SCH:
-				PPet->SetMJob(JOB_WHM);
-				break;
-				//multipurpose
-			case JOB_BRD:
-			case JOB_DRK:
-			case JOB_PLD:
-			case JOB_NIN:
-				PPet->SetMJob(JOB_RDM);
-				break;
-			}
-		}
+		// New Method to set Wyvern's type is in the ai_pet_dummy.cpp file, this leaves the dragoon's Wyvern to stay a DRG as it should.
+		PPet->SetMJob(JOB_DRG);
+		
 		PPet->SetMLevel(PMaster->GetMLevel());
 		LoadAvatarStats(PPet); //follows PC calcs (w/o SJ)
 		PPet->m_Weapons[SLOT_MAIN]->setDelay(floor(1000.0f*(320.0f/60.0f))); //320 delay