diff options
author | Mattes D <github@xoft.cz> | 2020-08-01 20:18:03 +0200 |
---|---|---|
committer | Tiger Wang <ziwei.tiger@outlook.com> | 2020-08-01 21:04:31 +0200 |
commit | 46398f4671012a0d913bd7bc0c70ffdc2645f2ac (patch) | |
tree | 11d766b1ce592e526b6cbac8d7a245208bdce26e /src/Entities/ProjectileEntity.cpp | |
parent | Added HandleCraftItem call to ShiftClickedResult to make sure achievements are awarded (#4791) (diff) | |
download | cuberite-46398f4671012a0d913bd7bc0c70ffdc2645f2ac.tar cuberite-46398f4671012a0d913bd7bc0c70ffdc2645f2ac.tar.gz cuberite-46398f4671012a0d913bd7bc0c70ffdc2645f2ac.tar.bz2 cuberite-46398f4671012a0d913bd7bc0c70ffdc2645f2ac.tar.lz cuberite-46398f4671012a0d913bd7bc0c70ffdc2645f2ac.tar.xz cuberite-46398f4671012a0d913bd7bc0c70ffdc2645f2ac.tar.zst cuberite-46398f4671012a0d913bd7bc0c70ffdc2645f2ac.zip |
Diffstat (limited to 'src/Entities/ProjectileEntity.cpp')
-rw-r--r-- | src/Entities/ProjectileEntity.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/Entities/ProjectileEntity.cpp b/src/Entities/ProjectileEntity.cpp index a8ba83b5d..1887e32a6 100644 --- a/src/Entities/ProjectileEntity.cpp +++ b/src/Entities/ProjectileEntity.cpp @@ -264,15 +264,15 @@ std::unique_ptr<cProjectileEntity> cProjectileEntity::Create( switch (a_Kind) { - case pkArrow: return cpp14::make_unique<cArrowEntity> (a_Creator, a_Pos, Speed); - case pkEgg: return cpp14::make_unique<cThrownEggEntity> (a_Creator, a_Pos, Speed); - case pkEnderPearl: return cpp14::make_unique<cThrownEnderPearlEntity>(a_Creator, a_Pos, Speed); - case pkSnowball: return cpp14::make_unique<cThrownSnowballEntity> (a_Creator, a_Pos, Speed); - case pkGhastFireball: return cpp14::make_unique<cGhastFireballEntity> (a_Creator, a_Pos, Speed); - case pkFireCharge: return cpp14::make_unique<cFireChargeEntity> (a_Creator, a_Pos, Speed); - case pkExpBottle: return cpp14::make_unique<cExpBottleEntity> (a_Creator, a_Pos, Speed); - case pkSplashPotion: return cpp14::make_unique<cSplashPotionEntity> (a_Creator, a_Pos, Speed, *a_Item); - case pkWitherSkull: return cpp14::make_unique<cWitherSkullEntity> (a_Creator, a_Pos, Speed); + case pkArrow: return std::make_unique<cArrowEntity> (a_Creator, a_Pos, Speed); + case pkEgg: return std::make_unique<cThrownEggEntity> (a_Creator, a_Pos, Speed); + case pkEnderPearl: return std::make_unique<cThrownEnderPearlEntity>(a_Creator, a_Pos, Speed); + case pkSnowball: return std::make_unique<cThrownSnowballEntity> (a_Creator, a_Pos, Speed); + case pkGhastFireball: return std::make_unique<cGhastFireballEntity> (a_Creator, a_Pos, Speed); + case pkFireCharge: return std::make_unique<cFireChargeEntity> (a_Creator, a_Pos, Speed); + case pkExpBottle: return std::make_unique<cExpBottleEntity> (a_Creator, a_Pos, Speed); + case pkSplashPotion: return std::make_unique<cSplashPotionEntity> (a_Creator, a_Pos, Speed, *a_Item); + case pkWitherSkull: return std::make_unique<cWitherSkullEntity> (a_Creator, a_Pos, Speed); case pkFirework: { ASSERT(a_Item != nullptr); @@ -281,7 +281,7 @@ std::unique_ptr<cProjectileEntity> cProjectileEntity::Create( return nullptr; } - return cpp14::make_unique<cFireworkEntity>(a_Creator, a_Pos, *a_Item); + return std::make_unique<cFireworkEntity>(a_Creator, a_Pos, *a_Item); } } |