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:
@@ -24,7 +24,7 @@ void Command::logAdminAction(shared_ptr<CommandSender> source, ChatPacket::EChat
|
||||
|
||||
void Command::logAdminAction(shared_ptr<CommandSender> source, int type, ChatPacket::EChatPacketMessage messageType, const wstring& message, int customData, const wstring& additionalMessage)
|
||||
{
|
||||
if (logger != NULL)
|
||||
if (logger != nullptr)
|
||||
{
|
||||
logger->logAdminCommand(source, type, messageType, message, customData, additionalMessage);
|
||||
}
|
||||
@@ -39,7 +39,7 @@ shared_ptr<ServerPlayer> Command::getPlayer(PlayerUID playerId)
|
||||
{
|
||||
shared_ptr<ServerPlayer> player = MinecraftServer::getInstance()->getPlayers()->getPlayer(playerId);
|
||||
|
||||
if (player == NULL)
|
||||
if (player == nullptr)
|
||||
{
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user