aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/EnchantmentTableEntity.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Minecraft.World/EnchantmentTableEntity.cpp')
-rw-r--r--Minecraft.World/EnchantmentTableEntity.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Minecraft.World/EnchantmentTableEntity.cpp b/Minecraft.World/EnchantmentTableEntity.cpp
index 15131aa2..dd9b6ad2 100644
--- a/Minecraft.World/EnchantmentTableEntity.cpp
+++ b/Minecraft.World/EnchantmentTableEntity.cpp
@@ -46,12 +46,12 @@ void EnchantmentTableEntity::tick()
oRot = rot;
shared_ptr<Player> player = level->getNearestPlayer(x + 0.5f, y + 0.5f, z + 0.5f, 3);
- if (player != NULL)
+ if (player != nullptr)
{
double xd = player->x - (x + 0.5f);
double zd = player->z - (z + 0.5f);
- tRot = (float) atan2(zd, xd);
+ tRot = static_cast<float>(atan2(zd, xd));
open += 0.1f;
@@ -124,7 +124,7 @@ void EnchantmentTableEntity::setCustomName(const wstring &name)
shared_ptr<TileEntity> EnchantmentTableEntity::clone()
{
- shared_ptr<EnchantmentTableEntity> result = shared_ptr<EnchantmentTableEntity>( new EnchantmentTableEntity() );
+ shared_ptr<EnchantmentTableEntity> result = std::make_shared<EnchantmentTableEntity>();
TileEntity::clone(result);
result->time = time;