diff options
Diffstat (limited to 'Minecraft.World/ItemEntity.cpp')
| -rw-r--r-- | Minecraft.World/ItemEntity.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Minecraft.World/ItemEntity.cpp b/Minecraft.World/ItemEntity.cpp index 28b3158b..5c3a4515 100644 --- a/Minecraft.World/ItemEntity.cpp +++ b/Minecraft.World/ItemEntity.cpp @@ -137,7 +137,7 @@ void ItemEntity::mergeWithNeighbours() vector<std::shared_ptr<Entity> > *neighbours = level->getEntitiesOfClass(typeid(*this), bb->grow(0.5, 0, 0.5)); for(AUTO_VAR(it, neighbours->begin()); it != neighbours->end(); ++it) { - std::shared_ptr<ItemEntity> entity = std::dynamic_pointer_cast<ItemEntity>(*it); + std::shared_ptr<ItemEntity> entity = dynamic_pointer_cast<ItemEntity>(*it); merge(entity); } delete neighbours; @@ -154,7 +154,7 @@ bool ItemEntity::merge(std::shared_ptr<ItemEntity> target) if (targetItem->hasTag() ^ myItem->hasTag()) return false; if (targetItem->hasTag() && !targetItem->getTag()->equals(myItem->getTag())) return false; if (targetItem->getItem()->isStackedByData() && targetItem->getAuxValue() != myItem->getAuxValue()) return false; - if (targetItem->count < myItem->count) return target->merge(std::dynamic_pointer_cast<ItemEntity>(shared_from_this())); + if (targetItem->count < myItem->count) return target->merge(dynamic_pointer_cast<ItemEntity>(shared_from_this())); if (targetItem->count + myItem->count > targetItem->getMaxStackSize()) return false; targetItem->count += myItem->count; |