LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-07-03 08:54:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2

Browse Source 
# Conflicts:
#	Minecraft.Client/Platform/Common/Consoles_App.cpp
#	Minecraft.World/IO/Files/File.cpp
This commit is contained in:
MatthewBeshay
2026-03-30 15:28:11 +11:00
parent 6000900285 9375009dd3
commit a104252557
6 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp
View File

@@ -625,7 +625,7 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame() {
bool pccFriendsAllowed = true;
bool bContentRestricted = false;
GetAllowedPlayerCreatedContentFlags(ProfileManager.GetPrimaryPad(),
ProfileManager.AllowedPlayerCreatedContent(ProfileManager.GetPrimaryPad(),
false, &pccAllowed,
&pccFriendsAllowed);
@@ -931,7 +931,7 @@ int UIScene_CreateWorldMenu::StartGame_SignInReturned(void* pParam,
bool pccAllowed = true;
bool pccFriendsAllowed = true;
GetAllowedPlayerCreatedContentFlags(ProfileManager.GetPrimaryPad(),
ProfileManager.AllowedPlayerCreatedContent(ProfileManager.GetPrimaryPad(),
false, &pccAllowed,
&pccFriendsAllowed);
if (!pccAllowed && !pccFriendsAllowed) noUGC = true;