Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 23 insertions, 0 deletions

diff --git a/Minecraft.Client/Common/Tutorial/HorseChoiceTask.h b/Minecraft.Client/Common/Tutorial/HorseChoiceTask.h
new file mode 100644
index 00000000..5130a7c7
--- /dev/null
+++ b/Minecraft.Client/Common/Tutorial/HorseChoiceTask.h
@@ -0,0 +1,23 @@
+#pragma once
+using namespace std;
+
+#include "ChoiceTask.h"
+
+
+// Same as choice task, but switches description based on horse type.
+class HorseChoiceTask : public ChoiceTask
+{
+protected:
+	int m_eHorseType;
+
+	int m_iDescHorse, m_iDescDonkey, m_iDescMule;
+
+public:
+	HorseChoiceTask(Tutorial *tutorial, int iDescHorse, int iDescDonkey, int iDescMule, int iPromptId = -1,
+		bool requiresUserInput = false, int iConfirmMapping = 0, int iCancelMapping = 0, 
+		eTutorial_CompletionAction cancelAction = e_Tutorial_Completion_None, ETelemetryChallenges telemetryEvent = eTelemetryChallenges_Unknown);
+
+	virtual int getDescriptionId();
+
+	virtual void onLookAtEntity(shared_ptr<Entity> entity);
+};
\ No newline at end of file