Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a.
This commit is contained in:
@@ -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;
|
||||
}
|
||||
Reference in New Issue
Block a user