diff options
| author | x12xx12x <44411062+12xx12@users.noreply.github.com> | 2021-11-26 00:51:47 +0100 |
|---|---|---|
| committer | Alexander Harkness <me@bearbin.net> | 2022-01-14 20:43:29 +0100 |
| commit | 250b8eb652a57dcbdff4af7b6efb9c2554b45798 (patch) | |
| tree | 1d8bf1aaeac6974d75c83524c8000161d8cc104c /src/BlockEntities | |
| parent | Fix WriteXZYPosition64 and add tests (diff) | |
| download | cuberite-250b8eb652a57dcbdff4af7b6efb9c2554b45798.tar cuberite-250b8eb652a57dcbdff4af7b6efb9c2554b45798.tar.gz cuberite-250b8eb652a57dcbdff4af7b6efb9c2554b45798.tar.bz2 cuberite-250b8eb652a57dcbdff4af7b6efb9c2554b45798.tar.lz cuberite-250b8eb652a57dcbdff4af7b6efb9c2554b45798.tar.xz cuberite-250b8eb652a57dcbdff4af7b6efb9c2554b45798.tar.zst cuberite-250b8eb652a57dcbdff4af7b6efb9c2554b45798.zip | |
Diffstat (limited to 'src/BlockEntities')
| -rw-r--r-- | src/BlockEntities/BeaconEntity.cpp | 4 | ||||
| -rw-r--r-- | src/BlockEntities/HopperEntity.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/BlockEntities/BeaconEntity.cpp b/src/BlockEntities/BeaconEntity.cpp index 87d25e57a..bff1b2e18 100644 --- a/src/BlockEntities/BeaconEntity.cpp +++ b/src/BlockEntities/BeaconEntity.cpp @@ -106,7 +106,7 @@ bool cBeaconEntity::SetPrimaryEffect(cEntityEffect::eType a_Effect) // Send window update: if (GetWindow() != nullptr) { - GetWindow()->SetProperty(1, m_PrimaryEffect); + GetWindow()->SetProperty(1, static_cast<short>(m_PrimaryEffect)); } return true; } @@ -128,7 +128,7 @@ bool cBeaconEntity::SetSecondaryEffect(cEntityEffect::eType a_Effect) // Send window update: if (GetWindow() != nullptr) { - GetWindow()->SetProperty(2, m_SecondaryEffect); + GetWindow()->SetProperty(2, static_cast<short>(m_SecondaryEffect)); } return true; } diff --git a/src/BlockEntities/HopperEntity.cpp b/src/BlockEntities/HopperEntity.cpp index 1e5c59c94..6c8a72c7e 100644 --- a/src/BlockEntities/HopperEntity.cpp +++ b/src/BlockEntities/HopperEntity.cpp @@ -254,7 +254,7 @@ bool cHopperEntity::MovePickupsIn(cChunk & a_Chunk) { m_bFoundPickupsAbove = true; - int PreviousCount = m_Contents.GetSlot(i).m_ItemCount; + char PreviousCount = m_Contents.GetSlot(i).m_ItemCount; Item.m_ItemCount -= m_Contents.ChangeSlotCount(i, Item.m_ItemCount) - PreviousCount; // Set count to however many items were added |