aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/EnchantItemCommand.cpp
diff options
context:
space:
mode:
authorModMaker101 <119018978+ModMaker101@users.noreply.github.com>2026-03-08 19:08:36 -0400
committerGitHub <noreply@github.com>2026-03-08 18:08:36 -0500
commit28614b922fb77149a54da1a87bebfbc98736f296 (patch)
tree7f828ba86a4ee18d0a80d29de64f6199a5412512 /Minecraft.World/EnchantItemCommand.cpp
parent88798b501d0cf6287b6f87acb2592676e3cec58d (diff)
Modernize project codebase (#906)
* 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 * Add safety checks and fix a issue with vector going OOR
Diffstat (limited to 'Minecraft.World/EnchantItemCommand.cpp')
-rw-r--r--Minecraft.World/EnchantItemCommand.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/Minecraft.World/EnchantItemCommand.cpp b/Minecraft.World/EnchantItemCommand.cpp
index 7ec57563..c8411709 100644
--- a/Minecraft.World/EnchantItemCommand.cpp
+++ b/Minecraft.World/EnchantItemCommand.cpp
@@ -28,15 +28,15 @@ void EnchantItemCommand::execute(shared_ptr<CommandSender> source, byteArray com
shared_ptr<ServerPlayer> player = getPlayer(uid);
- if(player == NULL) return;
+ if(player == nullptr) return;
shared_ptr<ItemInstance> selectedItem = player->getSelectedItem();
- if(selectedItem == NULL) return;
+ if(selectedItem == nullptr) return;
Enchantment *e = Enchantment::enchantments[enchantmentId];
- if(e == NULL) return;
+ if(e == nullptr) return;
if(!e->canEnchant(selectedItem)) return;
if(enchantmentLevel < e->getMinLevel()) enchantmentLevel = e->getMinLevel();
@@ -45,13 +45,13 @@ void EnchantItemCommand::execute(shared_ptr<CommandSender> source, byteArray com
if (selectedItem->hasTag())
{
ListTag<CompoundTag> *enchantmentTags = selectedItem->getEnchantmentTags();
- if (enchantmentTags != NULL)
+ if (enchantmentTags != nullptr)
{
for (int i = 0; i < enchantmentTags->size(); i++)
{
int type = enchantmentTags->get(i)->getShort((wchar_t *)ItemInstance::TAG_ENCH_ID);
- if (Enchantment::enchantments[type] != NULL)
+ if (Enchantment::enchantments[type] != nullptr)
{
Enchantment *other = Enchantment::enchantments[type];
if (!other->isCompatibleWith(e))
@@ -72,7 +72,7 @@ void EnchantItemCommand::execute(shared_ptr<CommandSender> source, byteArray com
shared_ptr<GameCommandPacket> EnchantItemCommand::preparePacket(shared_ptr<Player> player, int enchantmentId, int enchantmentLevel)
{
- if(player == NULL) return nullptr;
+ if(player == nullptr) return nullptr;
ByteArrayOutputStream baos;
DataOutputStream dos(&baos);
@@ -81,5 +81,5 @@ shared_ptr<GameCommandPacket> EnchantItemCommand::preparePacket(shared_ptr<Playe
dos.writeInt(enchantmentId);
dos.writeInt(enchantmentLevel);
- return shared_ptr<GameCommandPacket>( new GameCommandPacket(eGameCommand_EnchantItem, baos.toByteArray() ));
+ return std::make_shared<GameCommandPacket>(eGameCommand_EnchantItem, baos.toByteArray());
} \ No newline at end of file