diff options
| author | ModMaker101 <119018978+ModMaker101@users.noreply.github.com> | 2026-03-07 21:56:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-08 09:56:03 +0700 |
| commit | a9be52c41a02d207233199e98898fe7483d7e817 (patch) | |
| tree | 71dfaec3a86b05e9ca409b97d8eb9d7f993bfdd0 /Minecraft.World/GiveItemCommand.cpp | |
| parent | 1be5faaea781402e7de06b263eeca4c688b7712c (diff) | |
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
Diffstat (limited to 'Minecraft.World/GiveItemCommand.cpp')
| -rw-r--r-- | Minecraft.World/GiveItemCommand.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Minecraft.World/GiveItemCommand.cpp b/Minecraft.World/GiveItemCommand.cpp index b3cbff4f..fa06d80d 100644 --- a/Minecraft.World/GiveItemCommand.cpp +++ b/Minecraft.World/GiveItemCommand.cpp @@ -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()); }
\ No newline at end of file |