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

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

1 files changed, 10 insertions, 4 deletions

diff --git a/Minecraft.World/NetherBridgeFeature.h b/Minecraft.World/NetherBridgeFeature.h
index cd7f315f..2fd1701a 100644
--- a/Minecraft.World/NetherBridgeFeature.h
+++ b/Minecraft.World/NetherBridgeFeature.h
@@ -15,16 +15,22 @@ private:
 public:
 	NetherBridgeFeature();
 	~NetherBridgeFeature();
-    vector<Biome::MobSpawnerData *> *getBridgeEnemies();
+	wstring getFeatureName();
+	vector<Biome::MobSpawnerData *> *getBridgeEnemies();
 protected:
 	virtual bool isFeatureChunk(int x, int z, bool bIsSuperflat);
-    virtual StructureStart *createStructureStart(int x, int z);
+	virtual StructureStart *createStructureStart(int x, int z);
 public:
 	void clearCachedBuildings();
-private:
+
 	class NetherBridgeStart : public StructureStart
 	{
+public:
+	static StructureStart *Create() { return new NetherBridgeStart(); }
+	virtual EStructureStart GetType() { return eStructureStart_NetherBridgeStart; }
+
 	public:
+		NetherBridgeStart();
 		NetherBridgeStart(Level *level, Random *random, int chunkX, int chunkZ);
-    };
+	};
 };