LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-07-01 22:15:19 +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

20
Minecraft.World/Entities/Entity.cpp
View File

@@ -721,7 +721,7 @@ void Entity::move(double xa, double ya, double za,
level->getCubes(shared_from_this(), &expanded, noEntityCubes, true);
// LAND FIRST, then x and z
AUTO_VAR(itEndAABB, aABBs->end());
auto itEndAABB = aABBs->end();
// 4J Stu - Particles (and possibly other entities) don't have xChunk and
// zChunk set, so calculate the chunk instead
@@ -731,7 +731,7 @@ void Entity::move(double xa, double ya, double za,
// 4J Stu - It's horrible that the client is doing any movement at all!
// But if we don't have the chunk data then all the collision info will
// be incorrect as well
for (AUTO_VAR(it, aABBs->begin()); it != itEndAABB; it++)
for (auto it = aABBs->begin(); it != itEndAABB; it++)
ya = it->clipYCollide(bb, ya);
bb = bb.move(0, ya, 0);
}
@@ -743,7 +743,7 @@ void Entity::move(double xa, double ya, double za,
bool og = onGround || (yaOrg != ya && yaOrg < 0);
itEndAABB = aABBs->end();
for (AUTO_VAR(it, aABBs->begin()); it != itEndAABB; it++)
for (auto it = aABBs->begin(); it != itEndAABB; it++)
xa = it->clipXCollide(bb, xa);
bb = bb.move(xa, 0, 0);
@@ -753,7 +753,7 @@ void Entity::move(double xa, double ya, double za,
}
itEndAABB = aABBs->end();
for (AUTO_VAR(it, aABBs->begin()); it != itEndAABB; it++)
for (auto it = aABBs->begin(); it != itEndAABB; it++)
za = it->clipZCollide(bb, za);
bb = bb.move(0, 0, za);
@@ -788,7 +788,7 @@ void Entity::move(double xa, double ya, double za,
// 4J Stu - It's horrible that the client is doing any movement at
// all! But if we don't have the chunk data then all the collision
// info will be incorrect as well
for (AUTO_VAR(it, aABBs->begin()); it != itEndAABB; it++)
for (auto it = aABBs->begin(); it != itEndAABB; it++)
ya = it->clipYCollide(bb, ya);
bb = bb.move(0, ya, 0);
}
@@ -798,7 +798,7 @@ void Entity::move(double xa, double ya, double za,
}
itEndAABB = aABBs->end();
for (AUTO_VAR(it, aABBs->begin()); it != itEndAABB; it++)
for (auto it = aABBs->begin(); it != itEndAABB; it++)
xa = it->clipXCollide(bb, xa);
bb = bb.move(xa, 0, 0);
@@ -807,7 +807,7 @@ void Entity::move(double xa, double ya, double za,
}
itEndAABB = aABBs->end();
for (AUTO_VAR(it, aABBs->begin()); it != itEndAABB; it++)
for (auto it = aABBs->begin(); it != itEndAABB; it++)
za = it->clipZCollide(bb, za);
bb = bb.move(0, 0, za);
@@ -821,7 +821,7 @@ void Entity::move(double xa, double ya, double za,
ya = -footSize;
// LAND FIRST, then x and z
itEndAABB = aABBs->end();
for (AUTO_VAR(it, aABBs->begin()); it != itEndAABB; it++)
for (auto it = aABBs->begin(); it != itEndAABB; it++)
ya = it->clipYCollide(bb, ya);
bb = bb.move(0, ya, 0);
}
@@ -1524,8 +1524,8 @@ void Entity::lerpTo(double x, double y, double z, float yRot, float xRot,
AABBList* collisions = level->getCubes(shared_from_this(), &shrunk);
if (!collisions->empty()) {
double yTop = 0;
AUTO_VAR(itEnd, collisions->end());
for (AUTO_VAR(it, collisions->begin()); it != itEnd; it++) {
auto itEnd = collisions->end();
for (auto it = collisions->begin(); it != itEnd; it++) {
if (it->y1 > yTop) yTop = it->y1;
}