summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorx12xx12x <44411062+12xx12@users.noreply.github.com>2021-12-22 14:36:45 +0100
committerAlexander Harkness <me@bearbin.net>2022-01-14 20:43:29 +0100
commit5fa68ea807393c8b05f234dd2397d3e1f3f10f7d (patch)
treeb9af1ff2966e9e880d37353e3fcce6c316ad2296 /src
parentauto > char (diff)
downloadcuberite-5fa68ea807393c8b05f234dd2397d3e1f3f10f7d.tar
cuberite-5fa68ea807393c8b05f234dd2397d3e1f3f10f7d.tar.gz
cuberite-5fa68ea807393c8b05f234dd2397d3e1f3f10f7d.tar.bz2
cuberite-5fa68ea807393c8b05f234dd2397d3e1f3f10f7d.tar.lz
cuberite-5fa68ea807393c8b05f234dd2397d3e1f3f10f7d.tar.xz
cuberite-5fa68ea807393c8b05f234dd2397d3e1f3f10f7d.tar.zst
cuberite-5fa68ea807393c8b05f234dd2397d3e1f3f10f7d.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Pickup.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Entities/Pickup.cpp b/src/Entities/Pickup.cpp
index f37bb6b98..d266df502 100644
--- a/src/Entities/Pickup.cpp
+++ b/src/Entities/Pickup.cpp
@@ -56,7 +56,7 @@ public:
return false;
}
- m_Pickup->GetItem().AddCount(CombineCount);
+ m_Pickup->GetItem().AddCount(static_cast<short>(CombineCount));
Item.m_ItemCount -= CombineCount;
if (Item.m_ItemCount <= 0)