Changeset 488 for binary-improvements/MapRendering/API/GetPlayerInventory.cs

Timestamp:

Jun 21, 2024, 2:58:18 PM (5 months ago)

Author:

alloc

Message:

27_32_48

• V1.0 compatibility

File:

• binary-improvements/MapRendering/API/GetPlayerInventory.cs (modified) (2 diffs)

binary-improvements/MapRendering/API/GetPlayerInventory.cs

@@ -94 +94 @@
                         _writer.WriteBeginObject ();
                         
-                        AddEquipment (ref _writer, "head", _equ, EquipmentSlots.Headgear, _showIconColor, _showIconName);
-                        _writer.WriteValueSeparator ();
-                        AddEquipment (ref _writer, "eyes", _equ, EquipmentSlots.Eyewear, _showIconColor, _showIconName);
-                        _writer.WriteValueSeparator ();
-                        AddEquipment (ref _writer, "face", _equ, EquipmentSlots.Face, _showIconColor, _showIconName);
+                        AddEquipment (ref _writer, "head", _equ, EquipmentSlots.Head, _showIconColor, _showIconName);
                         _writer.WriteValueSeparator ();
 
-                        AddEquipment (ref _writer, "armor", _equ, EquipmentSlots.ChestArmor, _showIconColor, _showIconName);
-                        _writer.WriteValueSeparator ();
-                        AddEquipment (ref _writer, "jacket", _equ, EquipmentSlots.Jacket, _showIconColor, _showIconName);
-                        _writer.WriteValueSeparator ();
-                        AddEquipment (ref _writer, "shirt", _equ, EquipmentSlots.Shirt, _showIconColor, _showIconName);
+                        AddEquipment (ref _writer, "armor", _equ, EquipmentSlots.Chest, _showIconColor, _showIconName);
                         _writer.WriteValueSeparator ();
 
-                        AddEquipment (ref _writer, "legarmor", _equ, EquipmentSlots.LegArmor, _showIconColor, _showIconName);
-                        _writer.WriteValueSeparator ();
-                        AddEquipment (ref _writer, "pants", _equ, EquipmentSlots.Legs, _showIconColor, _showIconName);
-                        _writer.WriteValueSeparator ();
                         AddEquipment (ref _writer, "boots", _equ, EquipmentSlots.Feet, _showIconColor, _showIconName);
                         _writer.WriteValueSeparator ();
@@ -123 +111 @@
                         _writer.WritePropertyName (_slotname);
 
-                        int[] slotindices = XUiM_PlayerEquipment.GetSlotIndicesByEquipmentSlot (_slot);
+                        int slotindex = (int)_slot;
 
-                        for (int i = 0; i < slotindices.Length; i++) {
-                                if (_items? [slotindices [i]] != null) {
-                                        InvItem item = _items [slotindices [i]];
-                                        
-                                        GetJsonForItem (ref _writer, item, _showIconColor, _showIconName);
-                                        return;
-                                }
+                        if (_items == null || _items[slotindex] == null) {
+                                // Slot not found / empty
+                                _writer.WriteNull ();
+                                return;
                         }
-
-                        // Slot not found / empty
-                        _writer.WriteNull ();
+                        
+                        InvItem item = _items [slotindex];
+                        GetJsonForItem (ref _writer, item, _showIconColor, _showIconName);
                 }