12 files changed, 12 insertions, 12 deletions
diff --git a/src/Chunk.cpp b/src/Chunk.cpp
index efeb3b1e4..da13e3b10 100644
--- a/src/Chunk.cpp
+++ b/src/Chunk.cpp
@@ -781,7 +781,7 @@ void cChunk::CheckBlocks()
 void cChunk::TickBlocks(void)
 {
 	// Tick dem blocks
-	// _X: We must limit the random number or else we get a nasty int overflow bug - http://forum.mc-server.org/showthread.php?tid=457
+	// _X: We must limit the random number or else we get a nasty int overflow bug - https://forum.cuberite.org/thread-457.html
 	int RandomX = m_World->GetTickRandomNumber(0x00ffffff);
 	int RandomY = m_World->GetTickRandomNumber(0x00ffffff);
 	int RandomZ = m_World->GetTickRandomNumber(0x00ffffff);
diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp
index cbbf910fb..705f0bed5 100644
--- a/src/ChunkMap.cpp
+++ b/src/ChunkMap.cpp
@@ -3081,7 +3081,7 @@ void cChunkMap::cChunkLayer::UnloadUnusedChunks(void)
 		{
 			// The cChunk destructor calls our GetChunk() while removing its entities
 			// so we still need to be able to return the chunk. Therefore we first delete, then nullptrify
-			// Doing otherwise results in bug http://forum.mc-server.org/showthread.php?tid=355
+			// Doing otherwise results in bug https://forum.cuberite.org/thread-355.html
 			delete m_Chunks[i];
 			m_Chunks[i] = nullptr;
 		}
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index 4e882b5d8..792ca49b5 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -1366,7 +1366,7 @@ void cClientHandle::HandleRightClick(int a_BlockX, int a_BlockY, int a_BlockZ, e
 	{
 		// Only compare ItemType, not meta (torches have different metas)
 		// The -1 check is there because sometimes the client sends -1 instead of the held item
-		// Ref.: http://forum.mc-server.org/showthread.php?tid=549&pid=4502#pid4502
+		// Ref.: https://forum.cuberite.org/thread-549-post-4502.html#pid4502
 		LOGWARN("Player %s tried to place a block that was not equipped (exp %d, got %d)",
 			m_Username.c_str(), Equipped.m_ItemType, a_HeldItem.m_ItemType
 		);
diff --git a/src/Defines.h b/src/Defines.h
index e2f72ed84..63ea3b8e5 100644
--- a/src/Defines.h
+++ b/src/Defines.h
@@ -627,7 +627,7 @@ template <class T> inline T Diff(T a_Val1, T a_Val2)
 
 enum eMessageType
 {
-	// http://forum.mc-server.org/showthread.php?tid=1212
+	// https://forum.cuberite.org/thread-1212.html
 	// MessageType...
 
 	mtCustom,          // Send raw data without any processing
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index aeb70b552..d4097f734 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -1554,7 +1554,7 @@ void cEntity::SetSwimState(cChunk & a_Chunk)
 	if (!a_Chunk.UnboundedRelGetBlockType(RelX, RelY, RelZ, BlockIn))
 	{
 		// This sometimes happens on Linux machines
-		// Ref.: http://forum.mc-server.org/showthread.php?tid=1244
+		// Ref.: https://forum.cuberite.org/thread-1244.html
 		LOGD("SetSwimState failure: RelX = %d, RelZ = %d, Pos = %.02f, %.02f}",
 			RelX, RelY, GetPosX(), GetPosZ()
 		);
diff --git a/src/Generating/ComposableGenerator.h b/src/Generating/ComposableGenerator.h
index 41e4baf52..32345fc79 100644
--- a/src/Generating/ComposableGenerator.h
+++ b/src/Generating/ComposableGenerator.h
@@ -8,7 +8,7 @@ Generating works by composing several algorithms:
 Biome, TerrainHeight, TerrainComposition, Ores, Structures and SmallFoliage
 Each algorithm may be chosen from a pool of available algorithms in the same class and combined with others,
 based on user's preferences in the world.ini.
-See http://forum.mc-server.org/showthread.php?tid=409 for details.
+See https://forum.cuberite.org/thread-409.html for details.
 */
 
 
diff --git a/src/Items/ItemSlab.h b/src/Items/ItemSlab.h
index 97f721c2f..e51c6675b 100644
--- a/src/Items/ItemSlab.h
+++ b/src/Items/ItemSlab.h
@@ -121,7 +121,7 @@ public:
 		The client has a bug when a slab replaces snow and there's a slab above it.
 		The client then combines the slab above, rather than replacing the snow.
 		We send the block above the currently placed block back to the client to fix the bug.
-		Ref.: http://forum.mc-server.org/showthread.php?tid=434&pid=17388#pid17388
+		Ref.: https://forum.cuberite.org/thread-434-post-17388.html#pid17388
 		*/
 		if ((a_BlockFace == BLOCK_FACE_TOP) && (a_BlockY < cChunkDef::Height - 1))
 		{
diff --git a/src/Mobs/MonsterTypes.h b/src/Mobs/MonsterTypes.h
index c268b5ff6..d48005d2e 100644
--- a/src/Mobs/MonsterTypes.h
+++ b/src/Mobs/MonsterTypes.h
@@ -42,7 +42,7 @@ enum eMonsterType
 	mtWolf         = E_META_SPAWN_EGG_WOLF,
 	mtZombie       = E_META_SPAWN_EGG_ZOMBIE,
 	mtZombiePigman = E_META_SPAWN_EGG_ZOMBIE_PIGMAN,
-	mtMax          = 120,  // This is just a hotfix for http://forum.mc-server.org/showthread.php?tid=1616. Tolua is too bad to find the highest value, so this is needed.
+	mtMax          = 120,  // This is just a hotfix for https://forum.cuberite.org/thread-1616.html. Tolua is too bad to find the highest value, so this is needed.
 } ;
 
 // tolua_end
diff --git a/src/Server.cpp b/src/Server.cpp
index 5c050c215..5548e77d1 100644
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -373,7 +373,7 @@ void cServer::TickClients(float a_Dt)
 		{
 			if ((*itr)->IsDestroyed())
 			{
-				// Delete the client later, when CS is not held, to avoid deadlock: http://forum.mc-server.org/showthread.php?tid=374
+				// Delete the client later, when CS is not held, to avoid deadlock: https://forum.cuberite.org/thread-374.html
 				RemoveClients.push_back(*itr);
 				itr = m_Clients.erase(itr);
 				continue;
diff --git a/src/Simulator/FloodyFluidSimulator.cpp b/src/Simulator/FloodyFluidSimulator.cpp
index 45a34a8d9..518357f0b 100644
--- a/src/Simulator/FloodyFluidSimulator.cpp
+++ b/src/Simulator/FloodyFluidSimulator.cpp
@@ -2,7 +2,7 @@
 // FloodyFluidSimulator.cpp
 
 // Interfaces to the cFloodyFluidSimulator that represents a fluid simulator that tries to flood everything :)
-// http://forum.mc-server.org/showthread.php?tid=565
+// https://forum.cuberite.org/thread-565.html
 
 #include "Globals.h"
 
diff --git a/src/Simulator/FloodyFluidSimulator.h b/src/Simulator/FloodyFluidSimulator.h
index 0eac61a03..44ac05ab3 100644
--- a/src/Simulator/FloodyFluidSimulator.h
+++ b/src/Simulator/FloodyFluidSimulator.h
@@ -2,7 +2,7 @@
 // FloodyFluidSimulator.h
 
 // Interfaces to the cFloodyFluidSimulator that represents a fluid simulator that tries to flood everything :)
-// http://forum.mc-server.org/showthread.php?tid=565
+// https://forum.cuberite.org/thread-565.html
 
 
 
diff --git a/src/UI/Window.cpp b/src/UI/Window.cpp
index d0b963e13..e23c3c698 100644
--- a/src/UI/Window.cpp
+++ b/src/UI/Window.cpp
@@ -35,7 +35,7 @@ cWindow::cWindow(WindowType a_WindowType, const AString & a_WindowTitle) :
 	m_Owner(nullptr)
 {
 	// The window ID is signed in protocol 1.7, unsigned in protocol 1.8. Keep out of trouble by using only 7 bits:
-	// Ref.: http://forum.mc-server.org/showthread.php?tid=1876
+	// Ref.: https://forum.cuberite.org/thread-1876.html
 	ASSERT((m_WindowID >= 0) && (m_WindowID < 127));
 
 	if (a_WindowType == wtInventory)