4 files changed, 30 insertions, 5 deletions
diff --git a/source/BlockID.cpp b/source/BlockID.cpp
index 82bff9234..2fe495c6f 100644
--- a/source/BlockID.cpp
+++ b/source/BlockID.cpp
@@ -1,4 +1,3 @@
-
 // BlockID.cpp
 
 // Implements the helper functions for converting Block ID string to int etc.
@@ -934,6 +933,7 @@ public:
 		g_BlockIsTorchPlaceable[E_BLOCK_STAINED_CLAY]          = true;
 		g_BlockIsTorchPlaceable[E_BLOCK_WOOL]                  = true;
 		g_BlockIsTorchPlaceable[E_BLOCK_STONE]                 = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_STONE_BRICKS]          = true;
 	}
 } BlockPropertiesInitializer;
 
diff --git a/source/Mobs/Cow.cpp b/source/Mobs/Cow.cpp
index 8e9b87d27..dc59016e7 100644
--- a/source/Mobs/Cow.cpp
+++ b/source/Mobs/Cow.cpp
@@ -2,15 +2,12 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Cow.h"
+#include "../Entities/Player.h"
 
 
 
 
 
-// TODO: Milk Cow
-
-
-
 
 
 cCow::cCow(void) :
@@ -31,3 +28,18 @@ void cCow::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 
 
 
+
+void cCow::OnRightClicked(cPlayer & a_Player)
+{
+	if ((a_Player.GetEquippedItem().m_ItemType == E_ITEM_BUCKET))
+	{
+		if (!a_Player.IsGameModeCreative())
+		{
+			a_Player.GetInventory().RemoveOneEquippedItem();
+			a_Player.GetInventory().AddItem(E_ITEM_MILK);
+		}
+	}
+}
+
+
+
diff --git a/source/Mobs/Cow.h b/source/Mobs/Cow.h
index b90cb170e..0391d4a31 100644
--- a/source/Mobs/Cow.h
+++ b/source/Mobs/Cow.h
@@ -18,6 +18,7 @@ public:
 	CLASS_PROTODEF(cCow);
 
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+	virtual void OnRightClicked(cPlayer & a_Player) override;
 } ;
 
 
diff --git a/source/Mobs/Horse.cpp b/source/Mobs/Horse.cpp
index 46e7969cc..c2a8f6ed0 100644
--- a/source/Mobs/Horse.cpp
+++ b/source/Mobs/Horse.cpp
@@ -107,6 +107,18 @@ void cHorse::OnRightClicked(cPlayer & a_Player)
 	
 	m_TameAttemptTimes++;
 	a_Player.AttachTo(this);
+	
+	if (a_Player.GetEquippedItem().m_ItemType == E_ITEM_SADDLE)
+	{
+		if (!a_Player.IsGameModeCreative())
+		{
+			a_Player.GetInventory().RemoveOneEquippedItem();
+		}
+
+		// Set saddle state & broadcast metadata
+		m_bIsSaddled = true;
+		m_World->BroadcastEntityMetadata(*this);
+	}
 }