LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-30 11:46:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream-dev' into cleanup/nullptr-replacement

Browse Source 
# Conflicts:
#	Minecraft.Client/Network/PlayerChunkMap.cpp
#	Minecraft.Client/Network/PlayerList.cpp
#	Minecraft.Client/Network/ServerChunkCache.cpp
#	Minecraft.Client/Platform/Common/Consoles_App.cpp
#	Minecraft.Client/Platform/Common/DLC/DLCManager.cpp
#	Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp
#	Minecraft.Client/Platform/Common/GameRules/LevelRuleset.cpp
#	Minecraft.Client/Platform/Common/Tutorial/Tutorial.cpp
#	Minecraft.Client/Platform/Common/Tutorial/TutorialTask.cpp
#	Minecraft.Client/Platform/Common/UI/IUIScene_CreativeMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIComponent_Panorama.cpp
#	Minecraft.Client/Platform/Common/UI/UIController.cpp
#	Minecraft.Client/Platform/Common/UI/UIController.h
#	Minecraft.Client/Platform/Extrax64Stubs.cpp
#	Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Input.h
#	Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Storage.h
#	Minecraft.Client/Player/EntityTracker.cpp
#	Minecraft.Client/Player/ServerPlayer.cpp
#	Minecraft.Client/Rendering/EntityRenderers/PlayerRenderer.cpp
#	Minecraft.Client/Textures/Packs/DLCTexturePack.cpp
#	Minecraft.Client/Textures/Stitching/StitchedTexture.cpp
#	Minecraft.Client/Textures/Stitching/TextureMap.cpp
#	Minecraft.Client/Textures/Textures.cpp
#	Minecraft.World/Blocks/NotGateTile.cpp
#	Minecraft.World/Blocks/PressurePlateTile.cpp
#	Minecraft.World/Blocks/TileEntities/PotionBrewing.cpp
#	Minecraft.World/Enchantments/EnchantmentHelper.cpp
#	Minecraft.World/Entities/HangingEntity.cpp
#	Minecraft.World/Entities/LeashFenceKnotEntity.cpp
#	Minecraft.World/Entities/LivingEntity.cpp
#	Minecraft.World/Entities/Mobs/Boat.cpp
#	Minecraft.World/Entities/Mobs/Minecart.cpp
#	Minecraft.World/Entities/Mobs/Witch.cpp
#	Minecraft.World/Entities/SyncedEntityData.cpp
#	Minecraft.World/Items/LeashItem.cpp
#	Minecraft.World/Items/PotionItem.cpp
#	Minecraft.World/Level/BaseMobSpawner.cpp
#	Minecraft.World/Level/CustomLevelSource.cpp
#	Minecraft.World/Level/Level.cpp
#	Minecraft.World/Level/Storage/DirectoryLevelStorage.cpp
#	Minecraft.World/Level/Storage/McRegionLevelStorage.cpp
#	Minecraft.World/Level/Storage/RegionFileCache.cpp
#	Minecraft.World/Player/Player.cpp
#	Minecraft.World/WorldGen/Biomes/BiomeCache.cpp
#	Minecraft.World/WorldGen/Features/RandomScatteredLargeFeature.cpp
#	Minecraft.World/WorldGen/Layers/BiomeOverrideLayer.cpp
This commit is contained in:
MatthewBeshay
2026-03-30 16:28:40 +11:00
parent dfb0e3b03e 00cd713cc8
commit a0fdc643d1
265 changed files with 1408 additions and 1426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Minecraft.Client/Player/ServerPlayer.cpp
View File

@@ -153,8 +153,8 @@ void ServerPlayer::flagEntitiesToBeRemoved(unsigned int* flags,
memset(flags, 0, 2048 / 32);
}
AUTO_VAR(it, entitiesToRemove.begin());
for (AUTO_VAR(it, entitiesToRemove.begin()); it != entitiesToRemove.end();
auto it = entitiesToRemove.begin();
for (auto it = entitiesToRemove.begin(); it != entitiesToRemove.end();
it++) {
int index = *it;
if (index < 2048) {
@@ -259,7 +259,7 @@ void ServerPlayer::flushEntitiesToRemove() {
intArray ids(amount);
int pos = 0;
AUTO_VAR(it, entitiesToRemove.begin());
auto it = entitiesToRemove.begin();
while (it != entitiesToRemove.end() && pos < amount) {
ids[pos++] = *it;
it = entitiesToRemove.erase(it);
@@ -331,7 +331,7 @@ void ServerPlayer::doChunkSendingTick(bool dontDelayChunks) {
// the spiral of chunks that that method creates, long before
// transmission of them is complete.
double dist = DBL_MAX;
for (AUTO_VAR(it, chunksToSend.begin()); it != chunksToSend.end();
for (auto it = chunksToSend.begin(); it != chunksToSend.end();
it++) {
ChunkPos chunk = *it;
if (level->isChunkFinalised(chunk.x, chunk.z)) {
@@ -572,7 +572,7 @@ void ServerPlayer::doTickB() {
players.push_back(
std::dynamic_pointer_cast<Player>(shared_from_this()));
for (AUTO_VAR(it, objectives->begin()); it != objectives->end();
for (auto it = objectives->begin(); it != objectives->end();
++it) {
Objective* objective = *it;
getScoreboard()
@@ -806,9 +806,9 @@ void ServerPlayer::changeDimension(int i) {
thisPlayer->GetUserIndex());
}
if (thisPlayer != nullptr) {
for (AUTO_VAR(it, MinecraftServer::getInstance()
for (auto it = MinecraftServer::getInstance()
->getPlayers()
->players.begin());
->players.begin();
it !=
MinecraftServer::getInstance()->getPlayers()->players.end();
++it) {