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

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

1 files changed, 18 insertions, 0 deletions

diff --git a/Minecraft.World/EffectCommand.h b/Minecraft.World/EffectCommand.h
new file mode 100644
index 00000000..e198d0ac
--- /dev/null
+++ b/Minecraft.World/EffectCommand.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "Command.h"
+
+class EffectCommand : public Command
+{
+public:
+	EGameCommand getId();
+	int getPermissionLevel();
+	wstring getUsage(CommandSender *source);
+	void execute(shared_ptr<CommandSender> source, byteArray commandData);
+
+protected:
+	wstring getPlayerNames();
+
+public:
+	bool isValidWildcardPlayerArgument(wstring args, int argumentIndex);
+};
\ No newline at end of file