diff --git a/minecraft/Minecraft.Client/Common/Consoles_App.cpp b/minecraft/Minecraft.Client/Common/Consoles_App.cpp index 090eb50a9..dac8a7f94 100644 --- a/minecraft/Minecraft.Client/Common/Consoles_App.cpp +++ b/minecraft/Minecraft.Client/Common/Consoles_App.cpp @@ -1227,9 +1227,6 @@ void CMinecraftApp::SetPlayerSkin(int iPad, std::uint32_t dwSkinId) { GameSettingsA[iPad]->dwSelectedSkin = dwSkinId; GameSettingsA[iPad]->bSettingsChanged = true; - TelemetryManager->RecordSkinChanged(iPad, - GameSettingsA[iPad]->dwSelectedSkin); - if (Minecraft::GetInstance()->localplayers[iPad] != nullptr) Minecraft::GetInstance()->localplayers[iPad]->setAndBroadcastCustomSkin( dwSkinId); @@ -2622,8 +2619,6 @@ void CMinecraftApp::HandleXuiActions(void) { ProfileManager.SetCurrentGameActivity( j, CONTEXT_PRESENCE_MULTIPLAYER, false); } - TelemetryManager->RecordLevelExit( - j, eSen_LevelExitStatus_Exited); } } } else { @@ -2636,8 +2631,6 @@ void CMinecraftApp::HandleXuiActions(void) { ProfileManager.SetCurrentGameActivity( i, CONTEXT_PRESENCE_MULTIPLAYER_1P, false); } - TelemetryManager->RecordLevelExit( - i, eSen_LevelExitStatus_Exited); } break; case eAppAction_ExitWorldCapturedThumbnail: { @@ -3074,9 +3067,6 @@ void CMinecraftApp::HandleXuiActions(void) { // INVITES case eAppAction_DashboardTrialJoinFromInvite: { - TelemetryManager->RecordUpsellPresented( - i, eSen_UpsellID_Full_Version_Of_Game, app.m_dwOfferID); - SetAction(i, eAppAction_Idle); unsigned int uiIDA[2]; uiIDA[0] = IDS_CONFIRM_OK; @@ -3108,10 +3098,6 @@ void CMinecraftApp::HandleXuiActions(void) { this); } else { if (!ProfileManager.IsFullVersion()) { - TelemetryManager->RecordUpsellPresented( - i, eSen_UpsellID_Full_Version_Of_Game, - app.m_dwOfferID); - // upsell uiIDA[0] = IDS_CONFIRM_OK; uiIDA[1] = IDS_CONFIRM_CANCEL; @@ -3427,7 +3413,6 @@ void CMinecraftApp::HandleXuiActions(void) { // can't ban the level at that point if (g_NetworkManager.IsInGameplay() && !g_NetworkManager.IsLeavingGame()) { - TelemetryManager->RecordBanLevel(i); // primary player would exit the world, secondary would // exit the player @@ -3863,10 +3848,6 @@ int CMinecraftApp::UnlockFullInviteReturned(void* pParam, int iPad, false, iPad, eSen_UpsellID_Full_Version_Of_Game); } } - } else { - TelemetryManager->RecordUpsellResponded( - iPad, eSen_UpsellID_Full_Version_Of_Game, app.m_dwOfferID, - eSen_UpsellOutcome_Declined); } return 0; @@ -3886,10 +3867,6 @@ int CMinecraftApp::UnlockFullSaveReturned(void* pParam, int iPad, eSen_UpsellID_Full_Version_Of_Game); } } - } else { - TelemetryManager->RecordUpsellResponded( - iPad, eSen_UpsellID_Full_Version_Of_Game, app.m_dwOfferID, - eSen_UpsellOutcome_Declined); } return 0; @@ -3910,9 +3887,6 @@ int CMinecraftApp::UnlockFullExitReturned(void* pParam, int iPad, } } } else { - TelemetryManager->RecordUpsellResponded( - iPad, eSen_UpsellID_Full_Version_Of_Game, app.m_dwOfferID, - eSen_UpsellOutcome_Declined); pApp->SetAction(pMinecraft->player->GetXboxPad(), eAppAction_ExitWorldTrial); } @@ -3939,10 +3913,6 @@ int CMinecraftApp::TrialOverReturned(void* pParam, int iPad, eAppAction_ExitTrial); } } else { - TelemetryManager->RecordUpsellResponded( - iPad, eSen_UpsellID_Full_Version_Of_Game, app.m_dwOfferID, - eSen_UpsellOutcome_Declined); - pApp->SetAction(pMinecraft->player->GetXboxPad(), eAppAction_ExitTrial); } @@ -4224,11 +4194,6 @@ void CMinecraftApp::UpsellReturnedCallback(void* pParam, eUpsellType type, senType = eSen_UpsellID_Undefined; break; }; - - // Always the primary pad that gets an upsell - TelemetryManager->RecordUpsellResponded(ProfileManager.GetPrimaryPad(), - eSen_UpsellID_Full_Version_Of_Game, - app.m_dwOfferID, senResponse); } #if defined(_DEBUG_MENUS_ENABLED) @@ -5851,7 +5816,6 @@ void CMinecraftApp::RemoveLevelFromBannedLevelList(int iPad, PlayerUID xuid, if (pBannedListData != nullptr) { if (IsEqualXUID(pBannedListData->xuid, xuid) && (strcmp(pBannedListData->pszLevelName, pszLevelName) == 0)) { - TelemetryManager->RecordUnBanLevel(iPad); // match found, so remove this entry it = m_vBannedListA[iPad]->erase(it); diff --git a/minecraft/Minecraft.Client/Common/Source Files/Network/GameNetworkManager.cpp b/minecraft/Minecraft.Client/Common/Source Files/Network/GameNetworkManager.cpp index ef788b9b7..6e023cd66 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Network/GameNetworkManager.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Network/GameNetworkManager.cpp @@ -333,13 +333,8 @@ bool CGameNetworkManager::StartNetworkGame(Minecraft* minecraft, if (!g_NetworkManager.IsHost()) { Minecraft::GetInstance()->progressRenderer->progressStart( IDS_PROGRESS_CONNECTING); - } else { - // 4J Stu - Host needs to generate a unique multiplayer id for sentient - // telemetry reporting - int multiplayerInstanceId = - TelemetryManager->GenerateMultiplayerInstanceId(); - TelemetryManager->SetMultiplayerInstanceId(multiplayerInstanceId); } + TexturePack* tPack = Minecraft::GetInstance()->skins->getSelected(); do { app.DebugPrintf("ticking connection A\n"); @@ -1268,20 +1263,12 @@ void CGameNetworkManager::PlayerJoining(INetworkPlayer* pNetworkPlayer) { } } } - - if (pNetworkPlayer->IsLocal()) { - TelemetryManager->RecordPlayerSessionStart( - pNetworkPlayer->GetUserIndex()); - } } void CGameNetworkManager::PlayerLeaving(INetworkPlayer* pNetworkPlayer) { if (pNetworkPlayer->IsLocal()) { ProfileManager.SetCurrentGameActivity(pNetworkPlayer->GetUserIndex(), CONTEXT_PRESENCE_IDLE, false); - - TelemetryManager->RecordPlayerSessionExit( - pNetworkPlayer->GetUserIndex(), app.GetDisconnectReason()); } } diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ChoiceTask.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ChoiceTask.cpp index d5e4df68f..621d6953d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ChoiceTask.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ChoiceTask.cpp @@ -121,9 +121,5 @@ void ChoiceTask::sendTelemetry() { default: break; }; - - TelemetryManager->RecordEnemyKilledOrOvercome( - pMinecraft->player->GetXboxPad(), 0, 0, 0, 0, 0, 0, - m_eTelemetryEvent); } } diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/InfoTask.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/InfoTask.cpp index 7c10c23ff..d931028d2 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/InfoTask.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/InfoTask.cpp @@ -119,8 +119,5 @@ void InfoTask::sendTelemetry() { default: break; }; - TelemetryManager->RecordEnemyKilledOrOvercome( - pMinecraft->player->GetXboxPad(), 0, 0, 0, 0, 0, 0, - m_eTelemetryEvent); } } diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp index b6145e08b..3d3c3a430 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp @@ -205,10 +205,6 @@ void IUIScene_StartGame::UpdateCurrentTexturePack(int iSlot) { uint64_t ullOfferID_Full; app.GetDLCFullOfferIDForPackID(ListItem.iData, &ullOfferID_Full); - TelemetryManager->RecordUpsellPresented(ProfileManager.GetPrimaryPad(), - eSet_UpsellID_Texture_DLC, - ullOfferID_Full & 0xFFFFFFFF); - unsigned int uiIDA[3]; uiIDA[0] = IDS_TEXTUREPACK_FULLVERSION; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp index b563fa221..a8c6d650f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp @@ -150,8 +150,6 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void* initData, CHECKFORAVAILABLETEXTUREPACKS_TIMER_TIME); #endif - TelemetryManager->RecordMenuShown(m_iPad, eUIScene_CreateWorldMenu, 0); - // block input if we're waiting for DLC to install, and wipe the saves list. // The end of dlc mounting custom message will fill the list again if (app.StartInstallDLCProcess(m_iPad) == true) { @@ -389,9 +387,6 @@ void UIScene_CreateWorldMenu::StartSharedLaunchFlow() { app.GetDLCFullOfferIDForPackID(m_MoreOptionsParams.dwTexturePack, &ullOfferID_Full); - TelemetryManager->RecordUpsellPresented( - ProfileManager.GetPrimaryPad(), eSet_UpsellID_Texture_DLC, - ullOfferID_Full & 0xFFFFFFFF); #endif unsigned int uiIDA[2]; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp index 3a014f800..91b5f1926 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp @@ -19,8 +19,6 @@ UIScene_DLCMainMenu::UIScene_DLCMainMenu(int iPad, void* initData, if (m_loadedResolution == eSceneResolution_1080) { m_labelXboxStore.init(L""); } - - TelemetryManager->RecordMenuShown(iPad, eUIScene_DLCMainMenu, 0); } UIScene_DLCMainMenu::~UIScene_DLCMainMenu() { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp index bb6e9f833..6bcbca366 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp @@ -27,7 +27,6 @@ UIScene_DLCOffersMenu::UIScene_DLCOffersMenu(int iPad, void* initData, m_buttonListOffers.init(eControl_OffersList); m_labelHTMLSellText.init(L" "); m_labelPriceTag.init(L" "); - TelemetryManager->RecordMenuShown(m_iPad, eUIScene_DLCOffersMenu, 0); m_bHasPurchased = false; m_bIsSelected = false; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp index 1ccd6ab22..485c615cd 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp @@ -145,8 +145,6 @@ void UIScene_JoinMenu::tick() { // Alert the app the we want to be informed of ethernet connections app.SetLiveLinkRequired(true); - TelemetryManager->RecordMenuShown(m_iPad, eUIScene_JoinMenu, 0); - addTimer(UPDATE_PLAYERS_TIMER_ID, UPDATE_PLAYERS_TIMER_TIME); } diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp index 5d2891ebb..9043dbaf3 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp @@ -189,7 +189,6 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void* initData, } else { } - TelemetryManager->RecordMenuShown(m_iPad, eUIScene_LoadMenu, 0); m_iTexturePacksNotInstalled = 0; // block input if we're waiting for DLC to install, and wipe the saves list. @@ -547,10 +546,6 @@ void UIScene_LoadMenu::StartSharedLaunchFlow() { uint64_t ullOfferID_Full; app.GetDLCFullOfferIDForPackID(m_MoreOptionsParams.dwTexturePack, &ullOfferID_Full); - - TelemetryManager->RecordUpsellPresented( - ProfileManager.GetPrimaryPad(), eSet_UpsellID_Texture_DLC, - ullOfferID_Full & 0xFFFFFFFF); #endif unsigned int uiIDA[2]; @@ -1050,12 +1045,6 @@ void UIScene_LoadMenu::StartGameFromSave(UIScene_LoadMenu* pClass, int32_t saveOrCheckpointId = 0; bool validSave = StorageManager.GetSaveUniqueNumber(&saveOrCheckpointId); - TelemetryManager->RecordLevelResume( - pClass->m_iPad, eSen_FriendOrMatch_Playing_With_Invited_Friends, - eSen_CompeteOrCoop_Coop_and_Competitive, - app.GetGameSettings(pClass->m_iPad, eGameSetting_Difficulty), - app.GetLocalPlayerCount(), g_NetworkManager.GetOnlinePlayerCount(), - saveOrCheckpointId); } else { StorageManager.ResetSaveData(); // Make our next save default to the name of the level diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp index 6d96d01b0..70449393e 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp @@ -958,8 +958,6 @@ void UIScene_MainMenu::RunUnlockOrDLC(int iPad) { // check that the commerce is in the right state to be able to // display the full version purchase - if the user is fast with the // trial version, it can still be retrieving the product list - TelemetryManager->RecordUpsellPresented( - iPad, eSen_UpsellID_Full_Version_Of_Game, app.m_dwOfferID); ProfileManager.DisplayFullVersionPurchase( false, iPad, eSen_UpsellID_Full_Version_Of_Game); } diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp index ed748e036..cea046abf 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp @@ -45,9 +45,6 @@ void UIScene_TrialExitUpsell::handleInput(int iPad, int key, bool repeat, // 4J-PB - need to check this user can access the store { - TelemetryManager->RecordUpsellPresented( - iPad, eSen_UpsellID_Full_Version_Of_Game, - app.m_dwOfferID); ProfileManager.DisplayFullVersionPurchase( false, iPad, eSen_UpsellID_Full_Version_Of_Game); } diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp index c0ad240d8..176497439 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp @@ -161,9 +161,6 @@ UIScene_HowToPlay::UIScene_HowToPlay(int iPad, void* initData, (EHowToPlayPage)((uiInitData >> 16) & 0xFFFu); // Ignores MSB which is set to 1! - TelemetryManager->RecordMenuShown( - m_iPad, eUIScene_HowToPlay, (ETelemetry_HowToPlay_SubMenuId)eStartPage); - StartPage(eStartPage); } @@ -325,7 +322,4 @@ void UIScene_HowToPlay::StartPage(EHowToPlayPage ePage) { delete[] stringVal; updateTooltips(); - - TelemetryManager->RecordMenuShown(m_iPad, eUIScene_HowToPlay, - (ETelemetry_HowToPlay_SubMenuId)ePage); } diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp index 421e075e1..323cb98a4 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp @@ -93,8 +93,6 @@ void UIScene_DeathMenu::handlePress(F64 controlId, F64 childId) { playTime = (int)pMinecraft->localplayers[m_iPad] ->getSessionTimer(); } - TelemetryManager->RecordLevelExit( - m_iPad, eSen_LevelExitStatus_Failed); if (StorageManager.GetSaveDisabled()) { uiIDA[0] = IDS_CONFIRM_CANCEL; @@ -127,17 +125,12 @@ void UIScene_DeathMenu::handlePress(F64 controlId, F64 childId) { } } } else { - TelemetryManager->RecordLevelExit( - m_iPad, eSen_LevelExitStatus_Failed); - // just exit the player app.SetAction(m_iPad, eAppAction_ExitPlayer); } } else { // is it the primary player exiting? if (m_iPad == ProfileManager.GetPrimaryPad()) { - TelemetryManager->RecordLevelExit( - m_iPad, eSen_LevelExitStatus_Failed); // adjust the trial time played ui.ReduceTrialTimerValue(); @@ -152,9 +145,6 @@ void UIScene_DeathMenu::handlePress(F64 controlId, F64 childId) { &IUIScene_PauseMenu::ExitGameDialogReturned, (void*)GetCallbackUniqueId()); } else { - TelemetryManager->RecordLevelExit( - m_iPad, eSen_LevelExitStatus_Failed); - // just exit the player app.SetAction(m_iPad, eAppAction_ExitPlayer); } diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp index 054497591..b503c5469 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp @@ -54,9 +54,6 @@ UIScene_PauseMenu::UIScene_PauseMenu(int iPad, void* initData, eXuiServerAction_PauseServer, (void*)true); } - TelemetryManager->RecordMenuShown(m_iPad, eUIScene_PauseMenu, 0); - TelemetryManager->RecordPauseOrInactive(m_iPad); - Minecraft* pMinecraft = Minecraft::GetInstance(); if (pMinecraft != nullptr && pMinecraft->localgameModes[iPad] != nullptr) { TutorialMode* gameMode = @@ -390,9 +387,6 @@ void UIScene_PauseMenu::handlePress(F64 controlId, F64 childId) { ->getSessionTimer(); } - TelemetryManager->RecordLevelExit( - m_iPad, eSen_LevelExitStatus_Exited); - // just exit the player app.SetAction(m_iPad, eAppAction_ExitPlayer); } @@ -425,9 +419,6 @@ void UIScene_PauseMenu::handlePress(F64 controlId, F64 childId) { ->getSessionTimer(); } - TelemetryManager->RecordLevelExit( - m_iPad, eSen_LevelExitStatus_Exited); - // just exit the player app.SetAction(m_iPad, eAppAction_ExitPlayer); } diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp b/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp index 8076f5c93..5a07931b2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp @@ -4421,18 +4421,6 @@ void Minecraft::playerLeftTutorial(int iPad) { m_inFullTutorialBits = m_inFullTutorialBits & ~(1 << iPad); if (m_inFullTutorialBits == 0) { app.SetTutorialMode(false); - - // 4J Stu -This telemetry event means something different on XboxOne, so - // we don't call it for simple state changes like this - for (unsigned int idx = 0; idx < XUSER_MAX_COUNT; ++idx) { - if (localplayers[idx] != nullptr) { - TelemetryManager->RecordLevelStart( - idx, eSen_FriendOrMatch_Playing_With_Invited_Friends, - eSen_CompeteOrCoop_Coop_and_Competitive, level->difficulty, - app.GetLocalPlayerCount(), - g_NetworkManager.GetOnlinePlayerCount()); - } - } } } diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp index 8440f48e5..28237e0f1 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp @@ -353,12 +353,6 @@ void ClientConnection::handleLogin(std::shared_ptr packet) { if (iUserID != -1) { ui.UpdateSelectedItemPos(iUserID); } - - TelemetryManager->RecordLevelStart( - m_userIndex, eSen_FriendOrMatch_Playing_With_Invited_Friends, - eSen_CompeteOrCoop_Coop_and_Competitive, - Minecraft::GetInstance()->getLevel(packet->dimension)->difficulty, - app.GetLocalPlayerCount(), g_NetworkManager.GetOnlinePlayerCount()); } void ClientConnection::handleAddEntity( @@ -1801,11 +1795,6 @@ void ClientConnection::handleEntityActionAtPosition( if (packet->action == EntityActionAtPositionPacket::START_SLEEP) { std::shared_ptr player = std::dynamic_pointer_cast(e); player->startSleepInBed(packet->x, packet->y, packet->z); - - if (player == minecraft->localplayers[m_userIndex]) { - TelemetryManager->RecordEnemyKilledOrOvercome( - m_userIndex, 0, player->y, 0, 0, 0, 0, eTelemetryInGame_UseBed); - } } } @@ -2404,9 +2393,6 @@ void ClientConnection::handleRespawn(std::shared_ptr packet) { minecraft->setLevel(dimensionLevel); minecraft->player = lastPlayer; - TelemetryManager->RecordLevelExit(m_userIndex, - eSen_LevelExitStatus_Succeeded); - // minecraft->player->dimension = packet->dimension; minecraft->localplayers[m_userIndex]->dimension = packet->dimension; minecraft->setScreen(new ReceivingLevelScreen(this)); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp index fcdbfd815..2e7758d91 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp @@ -352,8 +352,6 @@ void MultiplayerLocalPlayer::ride(std::shared_ptr e) { break; }; } - TelemetryManager->RecordEnemyKilledOrOvercome(GetXboxPad(), 0, y, 0, 0, - 0, 0, eventType); } updateRichPresence(); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.cpp index dc4dd8d4a..d621cde05 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.cpp @@ -774,8 +774,6 @@ void LocalPlayer::hurtTo(float newHealth, ETelemetryChallenges damageSource) { int carriedId = inventory->getSelected() == nullptr ? 0 : inventory->getSelected()->id; - TelemetryManager->RecordPlayerDiedOrFailed(GetXboxPad(), 0, y, 0, 0, - carriedId, 0, damageSource); // if there are any xuiscenes up for this player, close them if (ui.GetMenuDisplayed(GetXboxPad())) { @@ -820,10 +818,6 @@ void LocalPlayer::awardStat(Stat* stat, const std::vector& param) { // players cannot get theme/avatar/gamerpic and Trial players cannot // get any This causes some extreme flooding of some awards if (ProfileManager.CanBeAwarded(m_iPad, ach->getAchievementID())) { - // 4J Stu - We don't (currently) care about the gamerscore, so - // setting to a default of 0 points - TelemetryManager->RecordAchievementUnlocked( - m_iPad, ach->getAchievementID(), 0); // 4J Stu - Some awards cause a menu to popup. This can be bad, // especially if you are surrounded by mobs! We cannot pause the diff --git a/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp b/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp index d634bd4a1..ded77319f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp @@ -860,14 +860,6 @@ void MinecraftServer::Suspend() { qwDeltaTime.QuadPart = qwNewTime.QuadPart - qwTime.QuadPart; fElapsedTime = fSecsPerTick * static_cast(qwDeltaTime.QuadPart); - // 4J-JEV: Flush stats and call PlayerSessionExit. - for (int iPad = 0; iPad < XUSER_MAX_COUNT; iPad++) { - if (ProfileManager.IsSignedIn(iPad)) { - TelemetryManager->RecordPlayerSessionExit( - iPad, DisconnectPacket::eDisconnect_Quitting); - } - } - m_suspending = false; app.DebugPrintf("Suspend server: Elapsed time %f\n", fElapsedTime); PIXEndNamedEvent(); diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp index 397fbd230..ec44dd71c 100644 --- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp +++ b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp @@ -655,8 +655,6 @@ void ConsoleSaveFileOriginal::Flush(bool autosave, bool updateThumbnail) { int32_t saveOrCheckpointId = 0; bool validSave = StorageManager.GetSaveUniqueNumber(&saveOrCheckpointId); - TelemetryManager->RecordLevelSaveOrCheckpoint( - ProfileManager.GetPrimaryPad(), saveOrCheckpointId, compLength + 8); #ifdef _WINDOWS64 // set the icon and save image StorageManager.SetSaveImages(pbThumbnailData, dwThumbnailDataSize, diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp index 9e0a0da17..e71a95302 100644 --- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp +++ b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp @@ -1370,8 +1370,6 @@ void ConsoleSaveFileSplit::Flush(bool autosave, bool updateThumbnail) { int32_t saveOrCheckpointId = 0; bool validSave = StorageManager.GetSaveUniqueNumber(&saveOrCheckpointId); - TelemetryManager->RecordLevelSaveOrCheckpoint( - ProfileManager.GetPrimaryPad(), saveOrCheckpointId, compLength + 8); // save the data StorageManager.SaveSaveData(&ConsoleSaveFileSplit::SaveSaveDataCallback,