LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-07-02 23:14:30 +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

12
Minecraft.World/IO/NBT/NbtSlotFile.cpp
View File

@@ -110,8 +110,8 @@ std::vector<CompoundTag*>* NbtSlotFile::readAll(int slot) {
std::vector<int>* fileSlots = fileSlotMap[slot];
int skipped = 0;
AUTO_VAR(itEnd, fileSlots->end());
for (AUTO_VAR(it, fileSlots->begin()); it != itEnd; it++) {
auto itEnd = fileSlots->end();
for (auto it = fileSlots->begin(); it != itEnd; it++) {
int c = *it; // fileSlots->at(i);
int pos = 0;
@@ -179,8 +179,8 @@ void NbtSlotFile::replaceSlot(int slot, std::vector<CompoundTag*>* tags) {
toReplace = fileSlotMap[slot];
fileSlotMap[slot] = new std::vector<int>();
AUTO_VAR(itEndTags, tags->end());
for (AUTO_VAR(it, tags->begin()); it != itEndTags; it++) {
auto itEndTags = tags->end();
for (auto it = tags->begin(); it != itEndTags; it++) {
CompoundTag* tag = *it; // tags->at(i);
byteArray compressed = NbtIo::compress(tag);
if (compressed.length > largest) {
@@ -235,8 +235,8 @@ void NbtSlotFile::replaceSlot(int slot, std::vector<CompoundTag*>* tags) {
delete[] compressed.data;
}
AUTO_VAR(itEndToRep, toReplace->end());
for (AUTO_VAR(it, toReplace->begin()); it != itEndToRep; it++) {
auto itEndToRep = toReplace->end();
for (auto it = toReplace->begin(); it != itEndToRep; it++) {
int c = *it; // toReplace->at(i);
freeFileSlots.push_back(c);