diff options
author | Tycho <work.tycho+git@gmail.com> | 2014-02-05 20:08:10 +0100 |
---|---|---|
committer | Tycho <work.tycho+git@gmail.com> | 2014-02-05 20:08:10 +0100 |
commit | 9015e56c604b2ad3ce47ddae8e9556187fe8978e (patch) | |
tree | 60b23762504cfb9eb4cba9758f15c0e5fab46123 /src/Item.h | |
parent | Modified automatic test for boundingBox (diff) | |
parent | Merge pull request #645 from mc-server/GroupsPermissions (diff) | |
download | cuberite-9015e56c604b2ad3ce47ddae8e9556187fe8978e.tar cuberite-9015e56c604b2ad3ce47ddae8e9556187fe8978e.tar.gz cuberite-9015e56c604b2ad3ce47ddae8e9556187fe8978e.tar.bz2 cuberite-9015e56c604b2ad3ce47ddae8e9556187fe8978e.tar.lz cuberite-9015e56c604b2ad3ce47ddae8e9556187fe8978e.tar.xz cuberite-9015e56c604b2ad3ce47ddae8e9556187fe8978e.tar.zst cuberite-9015e56c604b2ad3ce47ddae8e9556187fe8978e.zip |
Diffstat (limited to 'src/Item.h')
-rw-r--r-- | src/Item.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Item.h b/src/Item.h index ca9ec5a2b..4782f31c1 100644 --- a/src/Item.h +++ b/src/Item.h @@ -55,9 +55,9 @@ public: m_ItemType (a_ItemType), m_ItemCount (a_ItemCount), m_ItemDamage (a_ItemDamage), - m_Enchantments(a_Enchantments), m_CustomName (a_CustomName), - m_Lore (a_Lore) + m_Lore (a_Lore), + m_Enchantments(a_Enchantments) { if (!IsValidItem(m_ItemType)) { @@ -75,9 +75,9 @@ public: m_ItemType (a_CopyFrom.m_ItemType), m_ItemCount (a_CopyFrom.m_ItemCount), m_ItemDamage (a_CopyFrom.m_ItemDamage), - m_Enchantments(a_CopyFrom.m_Enchantments), m_CustomName (a_CopyFrom.m_CustomName), - m_Lore (a_CopyFrom.m_Lore) + m_Lore (a_CopyFrom.m_Lore), + m_Enchantments(a_CopyFrom.m_Enchantments) { } |