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/ArmorSlot.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/ArmorSlot.cpp')
| -rw-r--r-- | Minecraft.World/ArmorSlot.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Minecraft.World/ArmorSlot.cpp b/Minecraft.World/ArmorSlot.cpp index 1efe0b71..7707635a 100644 --- a/Minecraft.World/ArmorSlot.cpp +++ b/Minecraft.World/ArmorSlot.cpp @@ -12,13 +12,17 @@ ArmorSlot::ArmorSlot(int slotNum, shared_ptr<Container> container, int id, int x { } -int ArmorSlot::getMaxStackSize() +int ArmorSlot::getMaxStackSize() const { return 1; } bool ArmorSlot::mayPlace(shared_ptr<ItemInstance> item) { + if (item == NULL) + { + return false; + } if ( dynamic_cast<ArmorItem *>( item->getItem() ) != NULL) { return dynamic_cast<ArmorItem *>( item->getItem() )->slot == slotNum; |