LegacyConsole/4jcraft
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-06-22 18:35:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: unglob std::{min, max}, manual stuff

Browse Source
This commit is contained in:
Tropical
2026-03-06 20:47:11 -06:00
parent 967ffbb2a6
commit 04ff82ba70
54 changed files with 126 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Minecraft.World/Entities/ItemEntity.cpp
View File

@@ -158,8 +158,8 @@ bool ItemEntity::merge(std::shared_ptr<ItemEntity> target)
if (targetItem->count + myItem->count > targetItem->getMaxStackSize()) return false;
targetItem->count += myItem->count;
target->throwTime = max(target->throwTime, this->throwTime);
target->age = min(target->age, this->age);
target->throwTime = std::max(target->throwTime, this->throwTime);
target->age = std::min(target->age, this->age);
target->setItem(targetItem);
remove();