From 087b7e7abfe81dd7f0fdcdea36ac9f245950df1a Mon Sep 17 00:00:00 2001
From: Loki Rautio <lokirautio@gmail.com>
Date: Sat, 7 Mar 2026 21:12:22 -0600
Subject: Revert "Project modernization (#630)"

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 a9be52c41a02d207233199e98898fe7483d7e817.
---
 Minecraft.World/MerchantResultSlot.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Minecraft.World/MerchantResultSlot.cpp')

diff --git a/Minecraft.World/MerchantResultSlot.cpp b/Minecraft.World/MerchantResultSlot.cpp
index 7a09d069..fedbcc4a 100644
--- a/Minecraft.World/MerchantResultSlot.cpp
+++ b/Minecraft.World/MerchantResultSlot.cpp
@@ -42,7 +42,7 @@ void MerchantResultSlot::onTake(shared_ptr<Player> player, shared_ptr<ItemInstan
 	checkTakeAchievements(carried);
 
 	MerchantRecipe *activeRecipe = slots->getActiveRecipe();
-	if (activeRecipe != nullptr)
+	if (activeRecipe != NULL)
 	{
 		shared_ptr<ItemInstance> item1 = slots->getItem(MerchantMenu::PAYMENT1_SLOT);
 		shared_ptr<ItemInstance> item2 = slots->getItem(MerchantMenu::PAYMENT2_SLOT);
@@ -76,15 +76,15 @@ bool MerchantResultSlot::removePaymentItemsIfMatching(MerchantRecipe *activeReci
 	shared_ptr<ItemInstance> buyA = activeRecipe->getBuyAItem();
 	shared_ptr<ItemInstance> buyB = activeRecipe->getBuyBItem();
 
-	if (a != nullptr && a->id == buyA->id)
+	if (a != NULL && a->id == buyA->id)
 	{
-		if (buyB != nullptr && b != nullptr && buyB->id == b->id)
+		if (buyB != NULL && b != NULL && buyB->id == b->id)
 		{
 			a->count -= buyA->count;
 			b->count -= buyB->count;
 			return true;
 		}
-		else if (buyB == nullptr && b == nullptr)
+		else if (buyB == NULL && b == NULL)
 		{
 			a->count -= buyA->count;
 			return true;
-- 
cgit v1.2.3