@@ -3157,11 +3157,11 @@ Local<Value> PlayerClass::getAllItems(const Arguments& args) {
3157
3157
Player* player = get ();
3158
3158
if (!player) return Local<Value>();
3159
3159
3160
- const ItemStack& hand = player->getCarriedItem ();
3161
- const ItemStack& offHand = player->getOffhandSlot ();
3162
- vector<const ItemStack*> inventory = player->getInventory ().getSlots ();
3163
- vector<const ItemStack*> armor = player->getArmorContainer ().getSlots ();
3164
- vector<const ItemStack*> endChest = player->getEnderChestContainer ()->getSlots ();
3160
+ const ItemStack& hand = player->getCarriedItem ();
3161
+ const ItemStack& offHand = player->getOffhandSlot ();
3162
+ std:: vector<const ItemStack*> inventory = player->getInventory ().getSlots ();
3163
+ std:: vector<const ItemStack*> armor = player->getArmorContainer ().getSlots ();
3164
+ std:: vector<const ItemStack*> endChest = player->getEnderChestContainer ()->getSlots ();
3165
3165
3166
3166
Local<Object> result = Object::newObject ();
3167
3167
@@ -3174,21 +3174,27 @@ Local<Value> PlayerClass::getAllItems(const Arguments& args) {
3174
3174
// inventory
3175
3175
Local<Array> inventoryArr = Array::newArray ();
3176
3176
for (const ItemStack* item : inventory) {
3177
- inventoryArr.add (ItemClass::newItem ((ItemStack*)item, false ));
3177
+ if (item) {
3178
+ inventoryArr.add (ItemClass::newItem (const_cast <ItemStack*>(item), false ));
3179
+ }
3178
3180
}
3179
3181
result.set (" inventory" , inventoryArr);
3180
3182
3181
3183
// armor
3182
3184
Local<Array> armorArr = Array::newArray ();
3183
3185
for (const ItemStack* item : armor) {
3184
- armorArr.add (ItemClass::newItem ((ItemStack*)item, false ));
3186
+ if (item) {
3187
+ armorArr.add (ItemClass::newItem (const_cast <ItemStack*>(item), false ));
3188
+ }
3185
3189
}
3186
3190
result.set (" armor" , armorArr);
3187
3191
3188
3192
// endChest
3189
3193
Local<Array> endChestArr = Array::newArray ();
3190
3194
for (const ItemStack* item : endChest) {
3191
- endChestArr.add (ItemClass::newItem ((ItemStack*)item, false ));
3195
+ if (item) {
3196
+ endChestArr.add (ItemClass::newItem (const_cast <ItemStack*>(item), false ));
3197
+ }
3192
3198
}
3193
3199
result.set (" endChest" , endChestArr);
3194
3200
0 commit comments