Merge pull request #9 from swgemu/unstable

Merge unstable into aitest

Author: Hakry

MMOCoreORB/src/server/zone/managers/mission/MissionManagerImplementation.cpp

@@ -763,7 +763,8 @@ void MissionManagerImplementation::randomizeGenericDestroyMission(CreatureObject
 	if (difficulty == 5)
 		difficulty = 4;
 
-	int diffDisplay = difficultyLevel + 7;
+	int diffDisplay = difficultyLevel < 5 ? 4 : difficultyLevel;
+
 	if (player->isGrouped())
 		diffDisplay += player->getGroup()->getGroupLevel();
 	else

MMOCoreORB/src/server/zone/objects/creature/commands/StartMusicCommand.h

@@ -124,6 +124,7 @@ class StartMusicCommand: public QueueCommand {
 			return GENERALERROR;
 		}
 
+		creature->sendSystemMessage("@performance:music_start_self"); // You begin playing.
 		startMusic(creature, performanceIndex, instrument);
 
 		return SUCCESS;

MMOCoreORB/src/server/zone/objects/player/sessions/EntertainingSession.idl

@@ -103,8 +103,11 @@ class EntertainingSession extends Facade {
 	}
 
 	public int cancelSession() {
-		stopMusic(true);
-		stopDancing();
+		if (isPlayingMusic()) {
+			stopMusic(true);
+		} else {
+			stopDancing();
+		}
 
 		return 0;
 	}