Merge remote-tracking branch 'upstream/unstable' into unstable

Author: karlbunch

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;
 	}