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

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

1 files changed, 1 insertions, 11 deletions

diff --git a/Minecraft.World/MobSpawner.h b/Minecraft.World/MobSpawner.h
index b5022a77..452ddcc4 100644
--- a/Minecraft.World/MobSpawner.h
+++ b/Minecraft.World/MobSpawner.h
@@ -26,19 +26,9 @@ private:
 #endif
 
 public:
-	static const int tick(ServerLevel *level, bool spawnEnemies, bool spawnFriendlies);
+	static const int tick(ServerLevel *level, bool spawnEnemies, bool spawnFriendlies, bool spawnPersistent);
 	static bool isSpawnPositionOk(MobCategory *category, Level *level, int x, int y, int z);
 
-private:
-	static void finalizeMobSettings(shared_ptr<Mob> mob, Level *level, float xx, float yy, float zz);
-
-protected:
-	// 4J Stu TODO This was an array of Class type. I haven't made a base Class type yet, but don't need to
-	// as this can be an array of Mob type?
-	static const int bedEnemyCount = 3;
-	static eINSTANCEOF bedEnemies[bedEnemyCount];
-
-
 public:
 	static bool attackSleepingPlayers(Level *level, vector<shared_ptr<Player> > *players);