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

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

1 files changed, 22 insertions, 0 deletions

diff --git a/Minecraft.Client/Common/Tutorial/RideEntityTask.h b/Minecraft.Client/Common/Tutorial/RideEntityTask.h
new file mode 100644
index 00000000..d9b6d41e
--- /dev/null
+++ b/Minecraft.Client/Common/Tutorial/RideEntityTask.h
@@ -0,0 +1,22 @@
+#pragma once
+using namespace std;
+
+#include "TutorialTask.h"
+
+class Level;
+
+// 4J-JEV: Tasks that involve riding an entity.
+class RideEntityTask : public TutorialTask
+{
+protected:
+	const int m_eType;
+
+public:
+	RideEntityTask(const int eTYPE, Tutorial *tutorial, int descriptionId,
+		bool enablePreCompletion = false, vector<TutorialConstraint *> *inConstraints = NULL,
+		bool bShowMinimumTime = false, bool bAllowFade = true, bool bTaskReminders = true );
+
+	virtual bool isCompleted();
+
+	virtual void onRideEntity(shared_ptr<Entity> entity);
+};
\ No newline at end of file