Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Project modernization (#630)

Browse Source 
* 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:
ModMaker101
2026-03-07 21:56:03 -05:00
committed by GitHub
parent 1be5faaea7
commit a9be52c41a
1373 changed files with 19903 additions and 19449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Minecraft.World/GiveItemCommand.cpp
View File

@@ -30,9 +30,9 @@ void GiveItemCommand::execute(shared_ptr<CommandSender> source, byteArray comman
bais.reset();
shared_ptr<ServerPlayer> player = getPlayer(uid);
if(player != NULL && item > 0 && Item::items[item] != NULL)
if(player != nullptr && item > 0 && Item::items[item] != nullptr)
{
shared_ptr<ItemInstance> itemInstance = shared_ptr<ItemInstance>(new ItemInstance(item, amount, aux));
shared_ptr<ItemInstance> itemInstance = std::make_shared<ItemInstance>(item, amount, aux);
shared_ptr<ItemEntity> drop = player->drop(itemInstance);
drop->throwTime = 0;
//logAdminAction(source, L"commands.give.success", ChatPacket::e_ChatCustom, Item::items[item]->getName(itemInstance), item, amount, player->getAName());
@@ -42,7 +42,7 @@ void GiveItemCommand::execute(shared_ptr<CommandSender> source, byteArray comman
shared_ptr<GameCommandPacket> GiveItemCommand::preparePacket(shared_ptr<Player> player, int item, int amount, int aux, const wstring &tag)
{
if(player == NULL) return nullptr;
if(player == nullptr) return nullptr;
ByteArrayOutputStream baos;
DataOutputStream dos(&baos);
@@ -53,5 +53,5 @@ shared_ptr<GameCommandPacket> GiveItemCommand::preparePacket(shared_ptr<Player>
dos.writeInt(aux);
dos.writeUTF(tag);
return shared_ptr<GameCommandPacket>( new GameCommandPacket(eGameCommand_Give, baos.toByteArray() ));
return std::make_shared<GameCommandPacket>(eGameCommand_Give, baos.toByteArray());
}