LegacyConsole/4jcraft
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-06-10 19:44:11 +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

18
Minecraft.World/AI/Attributes/ModifiableAttributeInstance.cpp
View File

@@ -15,7 +15,7 @@ ModifiableAttributeInstance::ModifiableAttributeInstance(
ModifiableAttributeInstance::~ModifiableAttributeInstance() {
for (int i = 0; i < AttributeModifier::TOTAL_OPERATIONS; i++) {
for (AUTO_VAR(it, modifiers[i].begin()); it != modifiers[i].end();
for (auto it = modifiers[i].begin(); it != modifiers[i].end();
++it) {
// Delete all modifiers
delete *it;
@@ -45,7 +45,7 @@ void ModifiableAttributeInstance::getModifiers(
for (int i = 0; i < AttributeModifier::TOTAL_OPERATIONS; i++) {
std::unordered_set<AttributeModifier*>* opModifiers = &modifiers[i];
for (AUTO_VAR(it, opModifiers->begin()); it != opModifiers->end();
for (auto it = opModifiers->begin(); it != opModifiers->end();
++it) {
result.insert(*it);
}
@@ -55,7 +55,7 @@ void ModifiableAttributeInstance::getModifiers(
AttributeModifier* ModifiableAttributeInstance::getModifier(eMODIFIER_ID id) {
AttributeModifier* modifier = nullptr;
AUTO_VAR(it, modifierById.find(id));
auto it = modifierById.find(id);
if (it != modifierById.end()) {
modifier = it->second;
}
@@ -65,7 +65,7 @@ AttributeModifier* ModifiableAttributeInstance::getModifier(eMODIFIER_ID id) {
void ModifiableAttributeInstance::addModifiers(
std::unordered_set<AttributeModifier*>* modifiers) {
for (AUTO_VAR(it, modifiers->begin()); it != modifiers->end(); ++it) {
for (auto it = modifiers->begin(); it != modifiers->end(); ++it) {
addModifier(*it);
}
}
@@ -94,7 +94,7 @@ void ModifiableAttributeInstance::setDirty() {
void ModifiableAttributeInstance::removeModifier(AttributeModifier* modifier) {
for (int i = 0; i < AttributeModifier::TOTAL_OPERATIONS; i++) {
for (AUTO_VAR(it, modifiers[i].begin()); it != modifiers[i].end();
for (auto it = modifiers[i].begin(); it != modifiers[i].end();
++it) {
if (modifier->equals(*it)) {
modifiers[i].erase(it);
@@ -117,7 +117,7 @@ void ModifiableAttributeInstance::removeModifiers() {
std::unordered_set<AttributeModifier*> removingModifiers;
getModifiers(removingModifiers);
for (AUTO_VAR(it, removingModifiers.begin()); it != removingModifiers.end();
for (auto it = removingModifiers.begin(); it != removingModifiers.end();
++it) {
removeModifier(*it);
}
@@ -137,7 +137,7 @@ double ModifiableAttributeInstance::calculateValue() {
std::unordered_set<AttributeModifier*>* modifiers;
modifiers = getModifiers(AttributeModifier::OPERATION_ADDITION);
for (AUTO_VAR(it, modifiers->begin()); it != modifiers->end(); ++it) {
for (auto it = modifiers->begin(); it != modifiers->end(); ++it) {
AttributeModifier* modifier = *it;
base += modifier->getAmount();
}
@@ -145,13 +145,13 @@ double ModifiableAttributeInstance::calculateValue() {
double result = base;
modifiers = getModifiers(AttributeModifier::OPERATION_MULTIPLY_BASE);
for (AUTO_VAR(it, modifiers->begin()); it != modifiers->end(); ++it) {
for (auto it = modifiers->begin(); it != modifiers->end(); ++it) {
AttributeModifier* modifier = *it;
result += base * modifier->getAmount();
}
modifiers = getModifiers(AttributeModifier::OPERATION_MULTIPLY_TOTAL);
for (AUTO_VAR(it, modifiers->begin()); it != modifiers->end(); ++it) {
for (auto it = modifiers->begin(); it != modifiers->end(); ++it) {
AttributeModifier* modifier = *it;
result *= 1 + modifier->getAmount();
}