LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-06-05 13:55:50 +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

16
Minecraft.Client/Player/TrackedEntity.cpp
View File

@@ -80,7 +80,7 @@ void TrackedEntity::tick(EntityTracker* tracker,
!e->removed) {
std::shared_ptr<MapItemSavedData> data =
Item::map->getSavedData(item, e->level);
for (AUTO_VAR(it, players->begin()); it != players->end(); ++it) {
for (auto it = players->begin(); it != players->end(); ++it) {
std::shared_ptr<ServerPlayer> player =
std::dynamic_pointer_cast<ServerPlayer>(*it);
data->tickCarriedBy(player, item);
@@ -378,7 +378,7 @@ void TrackedEntity::broadcast(std::shared_ptr<Packet> packet) {
// can be sent to any player, but we try to restrict the network impact
// this has by not resending to the one machine
for (AUTO_VAR(it, seenBy.begin()); it != seenBy.end(); it++) {
for (auto it = seenBy.begin(); it != seenBy.end(); it++) {
std::shared_ptr<ServerPlayer> player = *it;
bool dontSend = false;
if (sentTo.size()) {
@@ -422,7 +422,7 @@ void TrackedEntity::broadcast(std::shared_ptr<Packet> packet) {
// This packet hasn't got canSendToAnyClient set, so just send to
// everyone here, and it
for (AUTO_VAR(it, seenBy.begin()); it != seenBy.end(); it++) {
for (auto it = seenBy.begin(); it != seenBy.end(); it++) {
(*it)->connection->send(packet);
}
}
@@ -441,13 +441,13 @@ void TrackedEntity::broadcastAndSend(std::shared_ptr<Packet> packet) {
}
void TrackedEntity::broadcastRemoved() {
for (AUTO_VAR(it, seenBy.begin()); it != seenBy.end(); it++) {
for (auto it = seenBy.begin(); it != seenBy.end(); it++) {
(*it)->entitiesToRemove.push_back(e->entityId);
}
}
void TrackedEntity::removePlayer(std::shared_ptr<ServerPlayer> sp) {
AUTO_VAR(it, seenBy.find(sp));
auto it = seenBy.find(sp);
if (it != seenBy.end()) {
sp->entitiesToRemove.push_back(e->entityId);
seenBy.erase(it);
@@ -635,7 +635,7 @@ void TrackedEntity::updatePlayer(EntityTracker* tracker,
std::dynamic_pointer_cast<LivingEntity>(e);
std::vector<MobEffectInstance*>* activeEffects =
mob->getActiveEffects();
for (AUTO_VAR(it, activeEffects->begin());
for (auto it = activeEffects->begin();
it != activeEffects->end(); ++it) {
MobEffectInstance* effect = *it;
@@ -645,7 +645,7 @@ void TrackedEntity::updatePlayer(EntityTracker* tracker,
delete activeEffects;
}
} else if (visibility == eVisibility_NotVisible) {
AUTO_VAR(it, seenBy.find(sp));
auto it = seenBy.find(sp);
if (it != seenBy.end()) {
seenBy.erase(it);
sp->entitiesToRemove.push_back(e->entityId);
@@ -838,7 +838,7 @@ std::shared_ptr<Packet> TrackedEntity::getAddEntityPacket() {
}
void TrackedEntity::clear(std::shared_ptr<ServerPlayer> sp) {
AUTO_VAR(it, seenBy.find(sp));
auto it = seenBy.find(sp);
if (it != seenBy.end()) {
seenBy.erase(it);
sp->entitiesToRemove.push_back(e->entityId);