diff options
| author | daniel0916 <theschokolps@gmail.com> | 2014-04-18 14:10:31 +0200 |
|---|---|---|
| committer | daniel0916 <theschokolps@gmail.com> | 2014-04-18 14:10:31 +0200 |
| commit | 3efd232829aaa15193550a300d3385f59316b4a8 (patch) | |
| tree | aaff2a9ff77593ba6207bb067513a5c8dd6d6a27 | |
| parent | Fixed some Errors (not all) (diff) | |
| download | cuberite-3efd232829aaa15193550a300d3385f59316b4a8.tar cuberite-3efd232829aaa15193550a300d3385f59316b4a8.tar.gz cuberite-3efd232829aaa15193550a300d3385f59316b4a8.tar.bz2 cuberite-3efd232829aaa15193550a300d3385f59316b4a8.tar.lz cuberite-3efd232829aaa15193550a300d3385f59316b4a8.tar.xz cuberite-3efd232829aaa15193550a300d3385f59316b4a8.tar.zst cuberite-3efd232829aaa15193550a300d3385f59316b4a8.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/ClientHandle.cpp | 2 | ||||
| -rw-r--r-- | src/Enchantments.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp index eab306a0c..bc1926976 100644 --- a/src/ClientHandle.cpp +++ b/src/ClientHandle.cpp @@ -2737,7 +2737,7 @@ void cClientHandle::HandleEnchantItem(Byte & WindowID, Byte & Enchantment) if (Item.EnchantByXPLevels(BaseEnchantmentLevel)) { - if (m_Player->IsGameModeCreative() | m_Player->DeltaExperience(-m_Player->XpForLevel(BaseEnchantmentLevel)) >= 0) + if (m_Player->IsGameModeCreative() || m_Player->DeltaExperience(-m_Player->XpForLevel(BaseEnchantmentLevel)) >= 0) { Window->m_SlotArea->SetSlot(0, *m_Player, Item); Window->SendSlot(*m_Player, Window->m_SlotArea, 0); diff --git a/src/Enchantments.h b/src/Enchantments.h index fa07dc2d4..1b3561faf 100644 --- a/src/Enchantments.h +++ b/src/Enchantments.h @@ -10,7 +10,6 @@ #include "Defines.h" #include "WorldStorage/EnchantmentSerializer.h" -#include "Entities/Player.h" |