summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorx12xx12x <44411062+12xx12@users.noreply.github.com>2021-12-22 16:15:48 +0100
committerAlexander Harkness <me@bearbin.net>2022-01-14 20:43:29 +0100
commit58f8918bcbb7a6eaee775e589464ea9192899865 (patch)
tree40749fbcf22de1992cf887c733f8ad2d8bc41014 /src/Entities
parentfixed bad web merge (diff)
downloadcuberite-58f8918bcbb7a6eaee775e589464ea9192899865.tar
cuberite-58f8918bcbb7a6eaee775e589464ea9192899865.tar.gz
cuberite-58f8918bcbb7a6eaee775e589464ea9192899865.tar.bz2
cuberite-58f8918bcbb7a6eaee775e589464ea9192899865.tar.lz
cuberite-58f8918bcbb7a6eaee775e589464ea9192899865.tar.xz
cuberite-58f8918bcbb7a6eaee775e589464ea9192899865.tar.zst
cuberite-58f8918bcbb7a6eaee775e589464ea9192899865.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 4f7462a1f..6cd709e08 100644
--- a/src/Entities/Pickup.cpp
+++ b/src/Entities/Pickup.cpp
@@ -56,7 +56,7 @@ public:
return false;
}
- m_Pickup->GetItem().AddCount(static_cast<short>(CombineCount));
+ m_Pickup->GetItem().AddCount(static_cast<char>(CombineCount));
Item.m_ItemCount -= CombineCount;
if (Item.m_ItemCount <= 0)