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

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

1 files changed, 30 insertions, 0 deletions

diff --git a/Minecraft.Client/Common/Tutorial/RideEntityTask.cpp b/Minecraft.Client/Common/Tutorial/RideEntityTask.cpp
new file mode 100644
index 00000000..29fe592d
--- /dev/null
+++ b/Minecraft.Client/Common/Tutorial/RideEntityTask.cpp
@@ -0,0 +1,30 @@
+#include "stdafx.h"
+
+#include <string>
+
+#include "Minecraft.h"
+#include "Tutorial.h"
+
+#include "..\Minecraft.World\EntityHorse.h"
+
+#include "RideEntityTask.h"
+
+RideEntityTask::RideEntityTask(const int eType, Tutorial *tutorial, int descriptionId,
+	bool enablePreCompletion, vector<TutorialConstraint *> *inConstraints, bool bShowMinimumTime, bool bAllowFade, bool bTaskReminders)
+	: TutorialTask( tutorial, descriptionId, enablePreCompletion, inConstraints, bShowMinimumTime, bAllowFade, bTaskReminders ),
+	m_eType( eType )
+{
+}
+
+bool RideEntityTask::isCompleted()
+{
+	return bIsCompleted;
+}
+
+void RideEntityTask::onRideEntity(shared_ptr<Entity> entity)
+{
+	if (entity->instanceof((eINSTANCEOF) m_eType))
+	{
+		bIsCompleted = true;
+	}
+}
\ No newline at end of file