aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/EnderpearlItem.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Minecraft.World/EnderpearlItem.cpp')
-rw-r--r--Minecraft.World/EnderpearlItem.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Minecraft.World/EnderpearlItem.cpp b/Minecraft.World/EnderpearlItem.cpp
index c024190b..e1ed693b 100644
--- a/Minecraft.World/EnderpearlItem.cpp
+++ b/Minecraft.World/EnderpearlItem.cpp
@@ -19,7 +19,7 @@ shared_ptr<ItemInstance> EnderpearlItem::use(shared_ptr<ItemInstance> instance,
{
// 4J-PB - Not sure why this was disabled for creative mode, so commenting out
//if (player->abilities.instabuild) return instance;
- if (player->riding != nullptr) return instance;
+ if (player->riding != NULL) return instance;
if (!player->abilities.instabuild)
{
instance->count--;
@@ -28,7 +28,7 @@ shared_ptr<ItemInstance> EnderpearlItem::use(shared_ptr<ItemInstance> instance,
level->playEntitySound(player, eSoundType_RANDOM_BOW, 0.5f, 0.4f / (random->nextFloat() * 0.4f + 0.8f));
if (!level->isClientSide)
{
- level->addEntity(std::make_shared<ThrownEnderpearl>(level, player));
+ level->addEntity( shared_ptr<ThrownEnderpearl>( new ThrownEnderpearl(level, player) ) );
}
return instance;
} \ No newline at end of file