From 96544d50ea06d8be3e7ee9a6d3047daf7d8531b2 Mon Sep 17 00:00:00 2001
From: "Igor Barkov (iwork)" <lopar@lopar.us>
Date: Mon, 25 Jan 2021 20:01:42 +0200
Subject: [PATCH] =?UTF-8?q?=D0=A4=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=81?=
 =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=BA=D0=B8=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8?=
 =?UTF-8?q?=D1=86=D1=8B=20=D0=BE=20=D0=BF=D1=80=D0=B5=D0=B4=D0=BC=D0=B5?=
 =?UTF-8?q?=D1=82=D0=B5=20=D0=BF=D0=BE=20=D1=81=D0=BB=D0=BE=D1=82=D1=83=20?=
 =?UTF-8?q?=D0=B2=20=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D0=BE=D0=BC=20=D0=BE?=
 =?UTF-8?q?=D0=BD=20=D0=BD=D0=B0=D1=85=D0=BE=D0=B4=D0=B8=D1=82=D1=81=D1=8F?=
 =?UTF-8?q?=20=D1=83=20=D0=B8=D0=B3=D1=80=D0=BE=D0=BA=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classes/Battles/DressedItems.php | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/classes/Battles/DressedItems.php b/classes/Battles/DressedItems.php
index f1acfa0..c1053d7 100644
--- a/classes/Battles/DressedItems.php
+++ b/classes/Battles/DressedItems.php
@@ -5,6 +5,9 @@
  * Time: 22:41
  */
 namespace Battles;
+use db;
+use Krugozor\Database\Mysql\Exception;
+
 class DressedItems
 {
     private $DB;
@@ -25,15 +28,20 @@ class DressedItems
     private function getDressedItems()
     {
         try {
-            $this->DB = \db::c()->query('SELECT * FROM inventory WHERE owner_id = ?i AND dressed_slot > 0', $this->USERID);
+            $this->DB = db::c()->query('SELECT * FROM inventory WHERE owner_id = ?i AND dressed_slot > 0', $this->USERID);
         } catch (\Exception $e) {
             echo '<div class="debug">Не прогрузилась таблица inventory (*) для класса DressedItems.</div>';
         }
     }
 
-    private function getDressedItemById($item_id)
+    private static function getDressedItemById($item_id)
     {
-        return \db::c()->query('SELECT * FROM inventory WHERE item_id = ?i AND dressed_slot > 0', $item_id)->fetch_assoc();
+        return db::c()->query('SELECT * FROM inventory WHERE item_id = ?i AND dressed_slot > 0', $item_id)->fetch_assoc();
+    }
+
+    public static function getDressedItemBySlot($itemSlot, $ownerId)
+    {
+        return db::c()->query('SELECT * FROM battles.inventory WHERE owner_id = ?i AND dressed_slot = ?i', $ownerId, $itemSlot)->fetch_assoc();
     }
 
     private function getBonusesFromDressedItems()
@@ -53,7 +61,7 @@ SELECT SUM(add_strength) as sum_strength,
        SUM(add_max_physical_damage) as sum_max_phys_damage
 FROM inventory WHERE owner_id = ?i AND dressed_slot > 0
 SQL;
-            $this->DBSUM = \db::c()->query($query, $this->USERID)->fetch_assoc();
+            $this->DBSUM = db::c()->query($query, $this->USERID)->fetch_assoc();
         } catch (\Exception $e) {
             echo '<div class="debug">Не прогрузилась таблица inventory (SUM) для класса DressedItems:' . $e . '</div>';
         }
@@ -127,14 +135,14 @@ SQL;
      * Снимает с предмета статус одетого на персонажа в определённом слоте персонажа.
      * @param $slot_id - номер слота.
      *
-     * @throws \Krugozor\Database\Mysql\Exception
+     * @throws Exception
      */
     public function undressItem($slot_id)
     {
         self::getItemsInSlots();
         // Проверяем, что используется один из 12 слотов и наличие предмета в слоте.
         if (in_array($slot_id, Item::ITEM_TYPES_ALLOWED_IN_SLOTS) && $this->dressedItem[$slot_id]) {
-            \db::c()->query('UPDATE inventory SET dressed_slot = 0 WHERE dressed_slot = ?i AND owner_id = ?i', $slot_id, $this->USERID);
+            db::c()->query('UPDATE inventory SET dressed_slot = 0 WHERE dressed_slot = ?i AND owner_id = ?i', $slot_id, $this->USERID);
         }
     }