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

Revert "Project modernization (#630)"

Browse Source 
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.

This reverts commit a9be52c41a.
This commit is contained in:
Loki Rautio
2026-03-07 21:12:22 -06:00
parent a9be52c41a
commit 087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Minecraft.World/EnchantItemCommand.cpp
View File

@@ -28,15 +28,15 @@ void EnchantItemCommand::execute(shared_ptr<CommandSender> source, byteArray com
shared_ptr<ServerPlayer> player = getPlayer(uid);
if(player == nullptr) return;
if(player == NULL) return;
shared_ptr<ItemInstance> selectedItem = player->getSelectedItem();
if(selectedItem == nullptr) return;
if(selectedItem == NULL) return;
Enchantment *e = Enchantment::enchantments[enchantmentId];
if(e == nullptr) return;
if(e == NULL) 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 != nullptr)
if (enchantmentTags != NULL)
{
for (int i = 0; i < enchantmentTags->size(); i++)
{
int type = enchantmentTags->get(i)->getShort((wchar_t *)ItemInstance::TAG_ENCH_ID);
if (Enchantment::enchantments[type] != nullptr)
if (Enchantment::enchantments[type] != NULL)
{
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 == nullptr) return nullptr;
if(player == NULL) 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 std::make_shared<GameCommandPacket>(eGameCommand_EnchantItem, baos.toByteArray());
return shared_ptr<GameCommandPacket>( new GameCommandPacket(eGameCommand_EnchantItem, baos.toByteArray() ));
}