From f7d5ff8debbbc1d80e8cd892d1184cb5aeb5bca4 Mon Sep 17 00:00:00 2001 From: Kae <80987908+Novaenia@users.noreply.github.com> Date: Sun, 25 Jun 2023 14:00:41 +1000 Subject: [PATCH] Fix ArmorWearer setters silly me --- source/game/StarArmorWearer.cpp | 16 ++++++++-------- source/game/StarItem.cpp | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/source/game/StarArmorWearer.cpp b/source/game/StarArmorWearer.cpp index fffde38..bb091e2 100644 --- a/source/game/StarArmorWearer.cpp +++ b/source/game/StarArmorWearer.cpp @@ -168,56 +168,56 @@ List ArmorWearer::statusEffects() const { } void ArmorWearer::setHeadItem(HeadArmorPtr headItem) { - if (!Item::itemsEqual(m_headItem, headItem)) + if (Item::itemsEqual(m_headItem, headItem)) return; m_headItem = headItem; m_needsHumanoidSync = true; } void ArmorWearer::setHeadCosmeticItem(HeadArmorPtr headCosmeticItem) { - if (!Item::itemsEqual(m_headCosmeticItem, headCosmeticItem)) + if (Item::itemsEqual(m_headCosmeticItem, headCosmeticItem)) return; m_headCosmeticItem = headCosmeticItem; m_needsHumanoidSync = true; } void ArmorWearer::setChestCosmeticItem(ChestArmorPtr chestCosmeticItem) { - if (!Item::itemsEqual(m_chestCosmeticItem, chestCosmeticItem)) + if (Item::itemsEqual(m_chestCosmeticItem, chestCosmeticItem)) return; m_chestCosmeticItem = chestCosmeticItem; m_needsHumanoidSync = true; } void ArmorWearer::setChestItem(ChestArmorPtr chestItem) { - if (!Item::itemsEqual(m_chestItem, chestItem)) + if (Item::itemsEqual(m_chestItem, chestItem)) return; m_chestItem = chestItem; m_needsHumanoidSync = true; } void ArmorWearer::setLegsItem(LegsArmorPtr legsItem) { - if (!Item::itemsEqual(m_legsItem, legsItem)) + if (Item::itemsEqual(m_legsItem, legsItem)) return; m_legsItem = legsItem; m_needsHumanoidSync = true; } void ArmorWearer::setLegsCosmeticItem(LegsArmorPtr legsCosmeticItem) { - if (!Item::itemsEqual(m_legsCosmeticItem, legsCosmeticItem)) + if (Item::itemsEqual(m_legsCosmeticItem, legsCosmeticItem)) return; m_legsCosmeticItem = legsCosmeticItem; m_needsHumanoidSync = true; } void ArmorWearer::setBackItem(BackArmorPtr backItem) { - if (!Item::itemsEqual(m_backItem, backItem)) + if (Item::itemsEqual(m_backItem, backItem)) return; m_backItem = backItem; m_needsHumanoidSync = true; } void ArmorWearer::setBackCosmeticItem(BackArmorPtr backCosmeticItem) { - if (!Item::itemsEqual(m_backCosmeticItem, backCosmeticItem)) + if (Item::itemsEqual(m_backCosmeticItem, backCosmeticItem)) return; m_backCosmeticItem = backCosmeticItem; m_needsHumanoidSync = true; diff --git a/source/game/StarItem.cpp b/source/game/StarItem.cpp index e25870b..4e4ec14 100644 --- a/source/game/StarItem.cpp +++ b/source/game/StarItem.cpp @@ -291,7 +291,7 @@ bool Item::itemsEqual(ItemConstPtr const& a, ItemConstPtr const& b) { if (a && b) // Both aren't null, compare return a->stackableWith(b); else // One is null, so not equal - return true; + return false; } }