diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-02-09 01:14:42 +0100 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-02-09 01:14:42 +0100 |
| commit | 9d1c9097e3a62f11cce94d1807c16a310eba6c2c (patch) | |
| tree | f186174dd8567c9f0d43969a19782d8fdb2fb2ed /src/Item.h | |
| parent | Merge branch 'master' into playerimprovements (diff) | |
| parent | Merge pull request #656 from mc-server/ReloadGroups (diff) | |
| download | cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar.gz cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar.bz2 cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar.lz cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar.xz cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar.zst cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.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) { } |