diff options
| author | Loki Rautio <lokirautio@gmail.com> | 2026-03-04 03:56:03 -0600 |
|---|---|---|
| committer | Loki Rautio <lokirautio@gmail.com> | 2026-03-04 03:56:03 -0600 |
| commit | 42aec6dac53dffa6afe072560a7e1d4986112538 (patch) | |
| tree | 0836426857391df1b6a83f6368a183f83ec9b104 /Minecraft.World/Slot.cpp | |
| parent | c9d58eeac7c72f0b3038e084667b4d89a6249fce (diff) | |
| parent | ef9b6fd500dfabd9463267b0dd9e29577eea8a2b (diff) | |
Merge branch 'main' into pr/win64-world-saves
# Conflicts:
# Minecraft.Client/MinecraftServer.cpp
# README.md
Diffstat (limited to 'Minecraft.World/Slot.cpp')
| -rw-r--r-- | Minecraft.World/Slot.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Minecraft.World/Slot.cpp b/Minecraft.World/Slot.cpp index 30fd9125..a5a53a48 100644 --- a/Minecraft.World/Slot.cpp +++ b/Minecraft.World/Slot.cpp @@ -91,7 +91,7 @@ void Slot::setChanged() container->setChanged(); } -int Slot::getMaxStackSize() +int Slot::getMaxStackSize() const { return container->getMaxStackSize(); } @@ -116,6 +116,11 @@ bool Slot::mayPickup(shared_ptr<Player> player) return true; } +bool Slot::isActive() +{ + return true; +} + bool Slot::mayCombine(shared_ptr<ItemInstance> second) { shared_ptr<ItemInstance> first = getItem(); |