From b3feddfef372618c8a9d7a0abcaf18cfad866c18 Mon Sep 17 00:00:00 2001
From: daoge <3523206925@qq.com>
Date: Tue, 3 Mar 2026 03:04:10 +0800
Subject: feat: TU19 (Dec 2014) Features & Content (#155)

* try to resolve merge conflict

* feat: TU19 (Dec 2014) Features & Content (#32)

* December 2014 files

* Working release build

* Fix compilation issues

* Add sound to Windows64Media

* Add DLC content and force Tutorial DLC

* Revert "Add DLC content and force Tutorial DLC"

This reverts commit 97a43994725008e35fceb984d5549df9c8cea470.

* Disable broken light packing

* Disable breakpoint during DLC texture map load

Allows DLC loading but the DLC textures are still broken

* Fix post build not working

* ...

* fix vs2022 build

* fix cmake build

---------

Co-authored-by: Loki <lokirautio@gmail.com>
---
 Minecraft.World/SaddleItem.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

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

diff --git a/Minecraft.World/SaddleItem.cpp b/Minecraft.World/SaddleItem.cpp
index 0effeb53..f982b751 100644
--- a/Minecraft.World/SaddleItem.cpp
+++ b/Minecraft.World/SaddleItem.cpp
@@ -6,26 +6,26 @@
 
 SaddleItem::SaddleItem(int id) : Item(id)
 {
-    maxStackSize = 1;
+	maxStackSize = 1;
 }
 
-bool SaddleItem::interactEnemy(shared_ptr<ItemInstance> itemInstance, shared_ptr<Mob> mob) 
+bool SaddleItem::interactEnemy(shared_ptr<ItemInstance> itemInstance, shared_ptr<Player> player, shared_ptr<LivingEntity> mob) 
 {
-    if ( dynamic_pointer_cast<Pig>(mob) )
+	if ( (mob != NULL) && mob->instanceof(eTYPE_PIG) )
 	{
-        shared_ptr<Pig> pig = dynamic_pointer_cast<Pig>(mob);
-        if (!pig->hasSaddle() && !pig->isBaby()) 
+		shared_ptr<Pig> pig = dynamic_pointer_cast<Pig>(mob);
+		if (!pig->hasSaddle() && !pig->isBaby()) 
 		{
-            pig->setSaddle(true);
-            itemInstance->count--;
-        }
+			pig->setSaddle(true);
+			itemInstance->count--;
+		}
 		return true;
-    }
+	}
 	return false;
 }
 
-bool SaddleItem::hurtEnemy(shared_ptr<ItemInstance> itemInstance, shared_ptr<Mob> mob, shared_ptr<Mob> attacker) 
+bool SaddleItem::hurtEnemy(shared_ptr<ItemInstance> itemInstance, shared_ptr<LivingEntity> mob, shared_ptr<LivingEntity> attacker) 
 {
-    interactEnemy(itemInstance, mob);
-    return true;
+	interactEnemy(itemInstance, nullptr, mob);
+	return true;
 }
\ No newline at end of file
-- 
cgit v1.2.3