summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-10-21 22:32:17 +0200
committerMattes D <github@xoft.cz>2014-10-21 22:32:17 +0200
commitb979cad8931e6d107e18d424274aee4bd2e59b41 (patch)
tree54d64585a81b8086bb5c1cbf51652aed273e5119 /src
parentMerge pull request #1515 from mc-server/BlockFixes (diff)
downloadcuberite-b979cad8931e6d107e18d424274aee4bd2e59b41.tar
cuberite-b979cad8931e6d107e18d424274aee4bd2e59b41.tar.gz
cuberite-b979cad8931e6d107e18d424274aee4bd2e59b41.tar.bz2
cuberite-b979cad8931e6d107e18d424274aee4bd2e59b41.tar.lz
cuberite-b979cad8931e6d107e18d424274aee4bd2e59b41.tar.xz
cuberite-b979cad8931e6d107e18d424274aee4bd2e59b41.tar.zst
cuberite-b979cad8931e6d107e18d424274aee4bd2e59b41.zip
Diffstat (limited to 'src')
-rw-r--r--src/Entities/ItemFrame.h2
-rw-r--r--src/WorldStorage/WSSAnvil.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Entities/ItemFrame.h b/src/Entities/ItemFrame.h
index 3642662f9..ced8c37af 100644
--- a/src/Entities/ItemFrame.h
+++ b/src/Entities/ItemFrame.h
@@ -33,7 +33,7 @@ public:
Byte GetItemRotation(void) const { return m_ItemRotation; }
/** Set the rotation from the item in the frame */
- void SetRotation(Byte a_ItemRotation) { m_ItemRotation = a_ItemRotation; }
+ void SetItemRotation(Byte a_ItemRotation) { m_ItemRotation = a_ItemRotation; }
// tolua_end
diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index eba21c659..8ebcff936 100644
--- a/src/WorldStorage/WSSAnvil.cpp
+++ b/src/WorldStorage/WSSAnvil.cpp
@@ -1743,7 +1743,7 @@ void cWSSAnvil::LoadItemFrameFromNBT(cEntityList & a_Entities, const cParsedNBT
int Rotation = a_NBT.FindChildByName(a_TagIdx, "ItemRotation");
if (Rotation > 0)
{
- ItemFrame->SetRotation((Byte)a_NBT.GetByte(Rotation));
+ ItemFrame->SetItemRotation((Byte)a_NBT.GetByte(Rotation));
}
a_Entities.push_back(ItemFrame.release());