Merge branch 'master' into server

gframe/tag_duel.cpp

@@ -686,8 +686,7 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) {
 			case 1:
 			case 2:
 			case 3:
-			case 5:
-			case 10: {
+			case 5: {
 				NetServer::SendBufferToPlayer(cur_player[player], STOC_GAME_MSG, offset, pbuf - offset);
 				break;
 			}
@@ -708,7 +707,8 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) {
 			}
 			case 11:
 			case 12:
-			case 13: {
+			case 13:
+			case 10: {
 				for(int i = 0; i < 4; ++i)
 					NetServer::SendBufferToPlayer(players[i], STOC_GAME_MSG, offset, pbuf - offset);
 				for(auto oit = observers.begin(); oit != observers.end(); ++oit)

ocgcore @ 07f66605

-Subproject commit 339f363431cd22f60189284c37708063c554e835
+Subproject commit 07f666057a689d70dda3b1da4e80fff1d5fbd098

script @ d9777969

-Subproject commit fbaf5bb51f7ec87ecf8a31048f0544b3ca6dc778
+Subproject commit d9777969962a8340acfa6d5151fc5ab4f56abf87