Project modernization (#630)
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides
This commit is contained in:
@@ -38,10 +38,10 @@ ListTag<CompoundTag> *PlayerEnderChestContainer::createTag()
|
||||
for (int i = 0; i < getContainerSize(); i++)
|
||||
{
|
||||
shared_ptr<ItemInstance> item = getItem(i);
|
||||
if (item != NULL)
|
||||
if (item != nullptr)
|
||||
{
|
||||
CompoundTag *tag = new CompoundTag();
|
||||
tag->putByte(L"Slot", (byte) i);
|
||||
tag->putByte(L"Slot", static_cast<byte>(i));
|
||||
item->save(tag);
|
||||
items->add(tag);
|
||||
}
|
||||
@@ -51,7 +51,7 @@ ListTag<CompoundTag> *PlayerEnderChestContainer::createTag()
|
||||
|
||||
bool PlayerEnderChestContainer::stillValid(shared_ptr<Player> player)
|
||||
{
|
||||
if (activeChest != NULL && !activeChest->stillValid(player))
|
||||
if (activeChest != nullptr && !activeChest->stillValid(player))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@@ -60,7 +60,7 @@ bool PlayerEnderChestContainer::stillValid(shared_ptr<Player> player)
|
||||
|
||||
void PlayerEnderChestContainer::startOpen()
|
||||
{
|
||||
if (activeChest != NULL)
|
||||
if (activeChest != nullptr)
|
||||
{
|
||||
activeChest->startOpen();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user