33 files changed, 59 insertions, 53 deletions

diff --git a/src/Bindings/LuaState.h b/src/Bindings/LuaState.h
index ffcddcfe8..8014f40d4 100644
--- a/src/Bindings/LuaState.h
+++ b/src/Bindings/LuaState.h
@@ -665,7 +665,7 @@ public:
 	bool GetStackValue(int a_StackPos, T & a_ReturnedVal, typename std::enable_if<std::is_integral<T>::value>::type * unused = nullptr)
 	{
 		UNUSED(unused);
-		if (!lua_isnumber(m_LuaState, a_StackPos))  // Also accepts strings representing a number: http://pgl.yoyo.org/luai/i/lua_isnumber
+		if (!lua_isnumber(m_LuaState, a_StackPos))  // Also accepts strings representing a number: https://pgl.yoyo.org/luai/i/lua_isnumber
 		{
 			return false;
 		}
diff --git a/src/BlockID.h b/src/BlockID.h
index 10a9b6672..6a1eefac4 100644
--- a/src/BlockID.h
+++ b/src/BlockID.h
@@ -270,7 +270,7 @@ enum ENUM_BLOCK_ID : BLOCKTYPE
 	E_BLOCK_STRUCTURE_BLOCK = 255,
 
 	// Keep these two as the last values. Update the last block value to the last block with an id less than 255 when adding another block
-	// IsValidBlock() depends on this (255 gets checked additionally because there is a gap. See http://minecraft.gamepedia.com/Data_values#Block_IDs
+	// IsValidBlock() depends on this (255 gets checked additionally because there is a gap. See https://minecraft.gamepedia.com/Data_values#Block_IDs
 	E_BLOCK_NUMBER_OF_TYPES = E_BLOCK_CONCRETE_POWDER + 1,  ///< Number of individual (different) blocktypes
 	E_BLOCK_MAX_TYPE_ID = E_BLOCK_NUMBER_OF_TYPES - 1,  ///< Maximum BlockType number used
 
diff --git a/src/Blocks/BlockBed.cpp b/src/Blocks/BlockBed.cpp
index 762086ce4..82f89a497 100644
--- a/src/Blocks/BlockBed.cpp
+++ b/src/Blocks/BlockBed.cpp
@@ -120,7 +120,7 @@ bool cBlockBedHandler::OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface
 		Vector3i Coords(a_BlockX, a_BlockY, a_BlockZ);
 		a_WorldInterface.DoExplosionAt(5, a_BlockX, a_BlockY, a_BlockZ, true, esBed, &Coords);
 	}
-	else if (!((a_WorldInterface.GetTimeOfDay() > 12541) && (a_WorldInterface.GetTimeOfDay() < 23458)))  // Source: http://minecraft.gamepedia.com/Bed#Sleeping
+	else if (!((a_WorldInterface.GetTimeOfDay() > 12541) && (a_WorldInterface.GetTimeOfDay() < 23458)))  // Source: https://minecraft.gamepedia.com/Bed#Sleeping
 	{
 		a_Player.SendMessageFailure("You can only sleep at night");
 	}
diff --git a/src/Blocks/BlockFarmland.h b/src/Blocks/BlockFarmland.h
index 7efd062d5..83a8385c2 100644
--- a/src/Blocks/BlockFarmland.h
+++ b/src/Blocks/BlockFarmland.h
@@ -105,7 +105,7 @@ public:
 		}
 
 		// Search for water in a close proximity:
-		// Ref.: http://minecraft.gamepedia.com/Farmland#Hydrated_Farmland_Tiles
+		// Ref.: https://minecraft.gamepedia.com/Farmland#Hydration
 		// TODO: Rewrite this to use the chunk and its neighbors directly
 		cBlockArea Area;
 		int BlockX = a_RelX + a_Chunk.GetPosX() * cChunkDef::Width;
diff --git a/src/Blocks/BlockHandler.h b/src/Blocks/BlockHandler.h
index 89d904be1..b96b3b770 100644
--- a/src/Blocks/BlockHandler.h
+++ b/src/Blocks/BlockHandler.h
@@ -140,7 +140,7 @@ public:
 	and wakes up all simulators on the block. */
 	virtual void Check(cChunkInterface & ChunkInterface, cBlockPluginInterface & a_PluginInterface, int a_RelX, int a_RelY, int a_RelZ, cChunk & a_Chunk);
 
-	/** Returns the base colour ID of the block, as will be represented on a map, as per documentation: http://minecraft.gamepedia.com/Map_item_format */
+	/** Returns the base colour ID of the block, as will be represented on a map, as per documentation: https://minecraft.gamepedia.com/Map_item_format */
 	virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta);
 
 	/** Rotates a given block meta counter-clockwise. Default: no change
diff --git a/src/Defines.h b/src/Defines.h
index c16b350d8..a3222f73a 100644
--- a/src/Defines.h
+++ b/src/Defines.h
@@ -414,7 +414,7 @@ inline bool IsValidBlock(int a_BlockType)
 		(a_BlockType > -1) &&
 		(a_BlockType <= E_BLOCK_MAX_TYPE_ID)
 		) ||
-		(a_BlockType == 255)  // the blocks 235-254 don't exist yet -> http://minecraft.gamepedia.com/Data_values#Block_IDs
+		(a_BlockType == 255)  // the blocks 253-254 don't exist yet -> https://minecraft.gamepedia.com/Data_values#Block_IDs
 	)
 	{
 		return true;
diff --git a/src/Enchantments.h b/src/Enchantments.h
index 3f7b1bfc8..5f2d3de4e 100644
--- a/src/Enchantments.h
+++ b/src/Enchantments.h
@@ -40,7 +40,7 @@ Serialization will never put zero-level enchantments into the stringspec and wil
 class cEnchantments
 {
 public:
-	/** Individual enchantment IDs, corresponding to their NBT IDs: http://minecraft.gamepedia.com/Data_values#Enchantment_IDs
+	/** Individual enchantment IDs, corresponding to their NBT IDs: https://minecraft.gamepedia.com/Data_values#Enchantment_IDs
 	*/
 
 	enum eEnchantment
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 7e374d9ba..4f35315f7 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -579,7 +579,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 int cEntity::GetRawDamageAgainst(const cEntity & a_Receiver)
 {
 	// Returns the hitpoints that this pawn can deal to a_Receiver using its equipped items
-	// Ref: http://minecraft.gamepedia.com/Damage#Dealing_damage as of 2012_12_20
+	// Ref: https://minecraft.gamepedia.com/Damage#Dealing_damage as of 2012_12_20
 	switch (this->GetEquippedWeapon().m_ItemType)
 	{
 		case E_ITEM_WOODEN_SWORD:    return 4;
@@ -625,7 +625,7 @@ void cEntity::ApplyArmorDamage(int DamageBlocked)
 
 bool cEntity::ArmorCoversAgainst(eDamageType a_DamageType)
 {
-	// Ref.: http://minecraft.gamepedia.com/Armor#Effects as of 2012_12_20
+	// Ref.: https://minecraft.gamepedia.com/Armor#Effects as of 2012_12_20
 	switch (a_DamageType)
 	{
 		case dtOnFire:
@@ -718,7 +718,7 @@ int cEntity::GetArmorCoverAgainst(const cEntity * a_Attacker, eDamageType a_Dama
 	}
 
 	// Add up all armor points:
-	// Ref.: http://minecraft.gamepedia.com/Armor#Defense_points
+	// Ref.: https://minecraft.gamepedia.com/Armor#Defense_points
 	int ArmorValue = 0;
 	int Toughness = 0;
 	switch (GetEquippedHelmet().m_ItemType)
@@ -755,7 +755,7 @@ int cEntity::GetArmorCoverAgainst(const cEntity * a_Attacker, eDamageType a_Dama
 	}
 
 	// TODO: Special armor cases, such as wool, saddles, dog's collar
-	// Ref.: http://minecraft.gamepedia.com/Armor#Mob_armor as of 2012_12_20
+	// Ref.: https://minecraft.gamepedia.com/Armor#Mob_armor as of 2012_12_20
 
 	double Reduction = std::max(ArmorValue / 5.0, ArmorValue - a_Damage / (2 + Toughness / 4.0));
 	return static_cast<int>(a_Damage * std::min(20.0, Reduction) / 25.0);
@@ -1712,7 +1712,7 @@ void cEntity::DoSetSpeed(double a_SpeedX, double a_SpeedY, double a_SpeedZ)
 
 void cEntity::HandleAir(void)
 {
-	// Ref.: http://www.minecraftwiki.net/wiki/Chunk_format
+	// Ref.: https://minecraft.gamepedia.com/Chunk_format
 	// See if the entity is /submerged/ water (block above is water)
 	// Get the type of block the entity is standing in:
 
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index db147f3fc..ace2eb6d7 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -580,7 +580,7 @@ protected:
 	/** Stores the air drag that is applied to the entity every tick, measured in speed ratio per tick
 	Acts as air friction and slows down flight
 	Will be interpolated if the server tick rate varies
-	Data: http://minecraft.gamepedia.com/Entity#Motion_of_entities */
+	Data: https://minecraft.gamepedia.com/Entity#Motion_of_entities */
 	float m_AirDrag;
 
 	Vector3d m_LastPosition;
diff --git a/src/Entities/EntityEffect.cpp b/src/Entities/EntityEffect.cpp
index cc9aaca5a..0ae50be80 100644
--- a/src/Entities/EntityEffect.cpp
+++ b/src/Entities/EntityEffect.cpp
@@ -23,7 +23,7 @@ cEntityEffect::eType cEntityEffect::GetPotionEffectType(short a_ItemDamage)
 {
 	// Lowest four bits
 	// Potion effect bits are different from entity effect values
-	// For reference: http://minecraft.gamepedia.com/Data_values#.22Potion_effect.22_bits
+	// For reference: https://minecraft.gamepedia.com/Data_values#.22Potion_effect.22_bits
 	switch (a_ItemDamage & 0x0f)
 	{
 		case 0x01: return cEntityEffect::effRegeneration;
@@ -112,9 +112,9 @@ int cEntityEffect::GetPotionEffectDuration(short a_ItemDamage)
 	SplashCoeff = IsPotionDrinkable(a_ItemDamage) ? 1 : 0.75;
 
 	// Ref.:
-	//   http://minecraft.gamepedia.com/Data_values#.22Tier.22_bit
-	//   http://minecraft.gamepedia.com/Data_values#.22Extended_duration.22_bit
-	//   http://minecraft.gamepedia.com/Data_values#.22Splash_potion.22_bit
+	//   https://minecraft.gamepedia.com/Data_values#.22Tier.22_bit
+	//   https://minecraft.gamepedia.com/Data_values#.22Extended_duration.22_bit
+	//   https://minecraft.gamepedia.com/Data_values#.22Splash_potion.22_bit
 
 	return static_cast<int>(base * TierCoeff * ExtCoeff * SplashCoeff);
 }
@@ -126,7 +126,7 @@ int cEntityEffect::GetPotionEffectDuration(short a_ItemDamage)
 bool cEntityEffect::IsPotionDrinkable(short a_ItemDamage)
 {
 	// Drinkable potion if 13th lowest bit is set
-	// Ref.: http://minecraft.gamepedia.com/Potions#Data_value_table
+	// Ref.: https://minecraft.gamepedia.com/Potions#Data_value_table
 	return ((a_ItemDamage & 0x2000) != 0);
 }
 
diff --git a/src/Entities/FireChargeEntity.cpp b/src/Entities/FireChargeEntity.cpp
index 56ce9ef3f..83c1f3c76 100644
--- a/src/Entities/FireChargeEntity.cpp
+++ b/src/Entities/FireChargeEntity.cpp
@@ -50,7 +50,7 @@ void cFireChargeEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_Hi
 
 	if (!a_EntityHit.IsFireproof())
 	{
-		// TODO Damage Entity with 5 damage(from http://minecraft.gamepedia.com/Blaze#Blaze_fireball)
+		// TODO Damage Entity with 5 damage(from https://minecraft.gamepedia.com/Blaze#Blaze_fireball)
 		a_EntityHit.StartBurning(5 * 20);  // 5 seconds of burning
 	}
 }
diff --git a/src/Entities/LeashKnot.cpp b/src/Entities/LeashKnot.cpp
index 52bb1b4b3..a86dc9d53 100644
--- a/src/Entities/LeashKnot.cpp
+++ b/src/Entities/LeashKnot.cpp
@@ -83,7 +83,7 @@ void cLeashKnot::TiePlayersLeashedMobs(cPlayer & a_Player, bool a_ShouldBroadCas
 
 			// All conditions met, unleash from player and leash to fence
 			PotentialLeashed->Unleash(false, false);
-			PotentialLeashed->LeashTo(m_Knot, m_ShouldBroadcast);
+			PotentialLeashed->LeashTo(*m_Knot, m_ShouldBroadcast);
 			return false;
 		}
 	} LookForLeashedsCallback(this, &a_Player, a_ShouldBroadCast);
diff --git a/src/Entities/Pawn.cpp b/src/Entities/Pawn.cpp
index a0095a8a4..233cdfa85 100644
--- a/src/Entities/Pawn.cpp
+++ b/src/Entities/Pawn.cpp
@@ -197,6 +197,13 @@ void cPawn::AddEntityEffect(cEntityEffect::eType a_EffectType, int a_Duration, s
 	}
 	a_Duration = static_cast<int>(a_Duration * a_DistanceModifier);
 
+	// If we already have the effect, we have to deactivate it or else it will act cumulatively
+	auto ExistingEffect = m_EntityEffects.find(a_EffectType);
+	if (ExistingEffect != m_EntityEffects.end())
+	{
+		ExistingEffect->second->OnDeactivate(*this);
+	}
+
 	auto Res = m_EntityEffects.emplace(a_EffectType, cEntityEffect::CreateEntityEffect(a_EffectType, a_Duration, a_Intensity, a_DistanceModifier));
 	m_World->BroadcastEntityEffect(*this, a_EffectType, a_Intensity, static_cast<short>(a_Duration));
 	cEntityEffect * Effect = Res.first->second.get();
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 3b0994726..60da8c758 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -2372,7 +2372,7 @@ void cPlayer::TickBurning(cChunk & a_Chunk)
 
 void cPlayer::HandleFood(void)
 {
-	// Ref.: http://minecraft.gamepedia.com/Hunger
+	// Ref.: https://minecraft.gamepedia.com/Hunger
 
 	if (IsGameModeCreative() || IsGameModeSpectator())
 	{
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index 8c21c25d6..5b0aa84a8 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -97,12 +97,12 @@ public:
 	float GetXpPercentage(void);
 
 	/** Calculates the amount of XP needed for a given level
-	Ref: http://minecraft.gamepedia.com/XP
+	Ref: https://minecraft.gamepedia.com/XP
 	*/
 	static int XpForLevel(int a_Level);
 
 	/** Inverse of XpForLevel
-	Ref: http://minecraft.gamepedia.com/XP
+	Ref: https://minecraft.gamepedia.com/XP
 	values are as per this with pre-calculations
 	*/
 	static int CalcLevelFromXp(int a_CurrentXp);
diff --git a/src/FurnaceRecipe.cpp b/src/FurnaceRecipe.cpp
index d1082b63f..d7e69b181 100644
--- a/src/FurnaceRecipe.cpp
+++ b/src/FurnaceRecipe.cpp
@@ -72,7 +72,7 @@ void cFurnaceRecipe::ReloadRecipes(void)
 		{
 			// There is a problem here on Android. Text files transferred from another OS may have a newline representation Android's implementation of getline doesn't expect
 			// Thus, part of a newline may be left in ParsingLine. ::empty() thus thinks the string isn't empty, and the below code outputs interesting errors since it was passed a nearly empty string
-			// Ref: http://stackoverflow.com/questions/6089231/getting-std-ifstream-to-handle-lf-cr-and-crlf
+			// Ref: https://stackoverflow.com/questions/6089231/getting-std-ifstream-to-handle-lf-cr-and-crlf
 			// TODO: There is a solution in the above reference, but it isn't very pretty. Fix it somehow.
 			continue;
 		}
diff --git a/src/Item.cpp b/src/Item.cpp
index 995ff59dc..9b17f1c37 100644
--- a/src/Item.cpp
+++ b/src/Item.cpp
@@ -471,7 +471,7 @@ bool cItem::CanHaveEnchantment(int a_EnchantmentID)
 	}
 
 	// The organization here is based on the summary at:
-	// http://minecraft.gamepedia.com/Enchanting
+	// https://minecraft.gamepedia.com/Enchanting
 	// as of July 2017 (Minecraft 1.12).
 
 	// Hand tool enchantments
diff --git a/src/Items/ItemBow.h b/src/Items/ItemBow.h
index 7cbd1dc70..67ea9f16f 100644
--- a/src/Items/ItemBow.h
+++ b/src/Items/ItemBow.h
@@ -1,4 +1,4 @@
-
+
 // ItemBow.h
 
 // Declares the cItemBowHandler class representing the itemhandler for bows
@@ -91,16 +91,15 @@ public:
 			}
 			else
 			{
-				Arrow->SetPickupState(cArrowEntity::psNoPickup);
+				ArrowPtr->SetPickupState(cArrowEntity::psNoPickup);
 			}
 
-
 			a_Player->UseEquippedItem();
 		}
 
 		if (a_Player->GetEquippedItem().m_Enchantments.GetLevel(cEnchantments::enchFlame) > 0)
 		{
-			Arrow->StartBurning(100);
+			ArrowPtr->StartBurning(100);
 		}
 	}
 } ;
diff --git a/src/Items/ItemPotion.h b/src/Items/ItemPotion.h
index dfc8aa033..906991348 100644
--- a/src/Items/ItemPotion.h
+++ b/src/Items/ItemPotion.h
@@ -21,7 +21,7 @@ public:
 	virtual bool IsDrinkable(short a_ItemDamage) override
 	{
 		// Drinkable potion if 13th lowest bit is set
-		// Ref.: http://minecraft.gamepedia.com/Potions#Data_value_table
+		// Ref.: https://minecraft.gamepedia.com/Potions#Data_value_table
 		return cEntityEffect::IsPotionDrinkable(a_ItemDamage);
 	}
 
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index 6e7e175a3..9759bceb0 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -478,7 +478,7 @@ void cMonster::CalcLeashActions()
 		auto LeashKnot = cLeashKnot::FindKnotAtPos(*m_World, { FloorC(m_LeashToPos->x), FloorC(m_LeashToPos->y), FloorC(m_LeashToPos->z) });
 		if (LeashKnot != nullptr)
 		{
-			LeashTo(LeashKnot);
+			LeashTo(*LeashKnot);
 			SetLeashToPos(nullptr);
 		}
 	}
@@ -734,7 +734,7 @@ void cMonster::OnRightClicked(cPlayer & a_Player)
 		{
 			a_Player.GetInventory().RemoveOneEquippedItem();
 		}
-		LeashTo(&a_Player);
+		LeashTo(a_Player);
 	}
 }
 
@@ -1380,7 +1380,7 @@ cMonster::eFamily cMonster::GetMobFamily(void) const
 
 
 
-void cMonster::LeashTo(cEntity * a_Entity, bool a_ShouldBroadcast)
+void cMonster::LeashTo(cEntity & a_Entity, bool a_ShouldBroadcast)
 {
 	// Do nothing if already leashed
 	if (m_LeashedTo != nullptr)
@@ -1388,13 +1388,13 @@ void cMonster::LeashTo(cEntity * a_Entity, bool a_ShouldBroadcast)
 		return;
 	}
 
-	m_LeashedTo = a_Entity;
+	m_LeashedTo = &a_Entity;
 
-	a_Entity->AddLeashedMob(this);
+	a_Entity.AddLeashedMob(this);
 
 	if (a_ShouldBroadcast)
 	{
-		m_World->BroadcastLeashEntity(*this, *a_Entity);
+		m_World->BroadcastLeashEntity(*this, a_Entity);
 	}
 
 	m_IsLeashActionJustDone = true;
diff --git a/src/Mobs/Monster.h b/src/Mobs/Monster.h
index 32091d6f9..44497723c 100644
--- a/src/Mobs/Monster.h
+++ b/src/Mobs/Monster.h
@@ -89,7 +89,7 @@ public:
 	bool IsLeashed() const { return (m_LeashedTo != nullptr); }
 
 	/** Leash the monster to an entity. */
-	void LeashTo(cEntity * a_Entity, bool a_ShouldBroadcast = true);
+	void LeashTo(cEntity & a_Entity, bool a_ShouldBroadcast = true);
 
 	/** Unleash the monster. Overload for the Unleash(bool, bool) function for plugins */
 	void Unleash(bool a_ShouldDropLeashPickup);
diff --git a/src/Mobs/Sheep.h b/src/Mobs/Sheep.h
index 9089cb592..01f90c968 100644
--- a/src/Mobs/Sheep.h
+++ b/src/Mobs/Sheep.h
@@ -33,7 +33,7 @@ public:
 	}
 
 	/** Generates a random color for the sheep like the vanilla server.
-	The percent's where used are from the wiki: http://minecraft.gamepedia.com/Sheep#Breeding */
+	The percent's where used are from the wiki: https://minecraft.gamepedia.com/Sheep#Breeding */
 	static NIBBLETYPE GenerateNaturalRandomColor(void);
 
 	bool IsSheared(void) const { return m_IsSheared; }
diff --git a/src/OSSupport/WinStackWalker.cpp b/src/OSSupport/WinStackWalker.cpp
index 6d732bd61..b9a8be39f 100644
--- a/src/OSSupport/WinStackWalker.cpp
+++ b/src/OSSupport/WinStackWalker.cpp
@@ -5,7 +5,7 @@
 
 
 /*
-LICENSE (http://www.opensource.org/licenses/bsd-license.php)
+LICENSE (https://www.opensource.org/licenses/bsd-license.php)
 
 Copyright (c) 2005-2010, Jochen Kalmbach
 All rights reserved.
@@ -504,7 +504,7 @@ private:
 		pGMI = (tGMI)GetProcAddress(hPsapi, "GetModuleInformation");
 		if ((pEPM == nullptr) || (pGMFNE == nullptr) || (pGMBN == nullptr) || (pGMI == nullptr))
 		{
-			// we couldn´t find all functions
+			// we couldn't find all functions
 			FreeLibrary(hPsapi);
 			return FALSE;
 		}
@@ -850,11 +850,11 @@ BOOL WinStackWalker::LoadModules()
 				strcat_s(szSymPath, nSymPathLen, "SRV*");
 				strcat_s(szSymPath, nSymPathLen, szTemp);
 				strcat_s(szSymPath, nSymPathLen, "\\websymbols");
-				strcat_s(szSymPath, nSymPathLen, "*http://msdl.microsoft.com/download/symbols;");
+				strcat_s(szSymPath, nSymPathLen, "*https://msdl.microsoft.com/download/symbols;");
 			}
 			else
 			{
-				strcat_s(szSymPath, nSymPathLen, "SRV*c:\\websymbols*http://msdl.microsoft.com/download/symbols;");
+				strcat_s(szSymPath, nSymPathLen, "SRV*c:\\websymbols*https://msdl.microsoft.com/download/symbols;");
 			}
 		}
 	}  // if SymBuildPath
diff --git a/src/OSSupport/WinStackWalker.h b/src/OSSupport/WinStackWalker.h
index 9dfd08e00..0479bd17b 100644
--- a/src/OSSupport/WinStackWalker.h
+++ b/src/OSSupport/WinStackWalker.h
@@ -3,7 +3,7 @@
 // Declares the stack walking for Windows binaries
 
 /*
-LICENSE (http://www.opensource.org/licenses/bsd-license.php)
+LICENSE (https://www.opensource.org/licenses/bsd-license.php)
 
 Copyright (c) 2005-2010, Jochen Kalmbach
 All rights reserved.
diff --git a/src/PolarSSL++/Sha1Checksum.h b/src/PolarSSL++/Sha1Checksum.h
index 23eb6f420..b78fbfc62 100644
--- a/src/PolarSSL++/Sha1Checksum.h
+++ b/src/PolarSSL++/Sha1Checksum.h
@@ -33,7 +33,7 @@ public:
 	bool DoesAcceptInput(void) const { return m_DoesAcceptInput; }
 
 	/** Converts a raw 160-bit SHA1 digest into a Java Hex representation
-	According to http://wiki.vg/wiki/index.php?title=Protocol_Encryption&oldid=2802
+	According to http://wiki.vg/Protocol_Encryption
 	*/
 	static void DigestToJava(const Checksum & a_Digest, AString & a_JavaOut);
 
diff --git a/src/Protocol/Authenticator.h b/src/Protocol/Authenticator.h
index 660a4a854..5ce06093c 100644
--- a/src/Protocol/Authenticator.h
+++ b/src/Protocol/Authenticator.h
@@ -3,7 +3,7 @@
 
 // Interfaces to the cAuthenticator class representing the thread that authenticates users against the official Mojang servers
 // Authentication prevents "hackers" from joining with an arbitrary username (possibly impersonating the server admins)
-// For more info, see http://wiki.vg/Session#Server_operation
+// For more info, see http://wiki.vg/Session
 // In Cuberite, authentication is implemented as a single thread that receives queued auth requests and dispatches them one by one.
 
 
diff --git a/src/Protocol/Protocol_1_10.cpp b/src/Protocol/Protocol_1_10.cpp
index e3d05f5ae..2291eb6fc 100644
--- a/src/Protocol/Protocol_1_10.cpp
+++ b/src/Protocol/Protocol_1_10.cpp
@@ -617,7 +617,7 @@ void cProtocol_1_10_0::WriteBlockEntity(cPacketizer & a_Pkt, const cBlockEntity
 			Writer.AddByte("Rot", MobHeadEntity.GetRotation() & 0xFF);
 			Writer.AddString("id", "Skull");  // "Tile Entity ID" - MC wiki; vanilla server always seems to send this though
 
-			// The new Block Entity format for a Mob Head. See: http://minecraft.gamepedia.com/Head#Block_entity
+			// The new Block Entity format for a Mob Head. See: https://minecraft.gamepedia.com/Head#Block_entity
 			Writer.BeginCompound("Owner");
 			Writer.AddString("Id", MobHeadEntity.GetOwnerUUID());
 			Writer.AddString("Name", MobHeadEntity.GetOwnerName());
diff --git a/src/Protocol/Protocol_1_11.cpp b/src/Protocol/Protocol_1_11.cpp
index 4a4006390..9212e97ed 100644
--- a/src/Protocol/Protocol_1_11.cpp
+++ b/src/Protocol/Protocol_1_11.cpp
@@ -464,7 +464,7 @@ void cProtocol_1_11_0::WriteBlockEntity(cPacketizer & a_Pkt, const cBlockEntity
 			Writer.AddByte("Rot", MobHeadEntity.GetRotation() & 0xFF);
 			Writer.AddString("id", "Skull");  // "Tile Entity ID" - MC wiki; vanilla server always seems to send this though
 
-			// The new Block Entity format for a Mob Head. See: http://minecraft.gamepedia.com/Head#Block_entity
+			// The new Block Entity format for a Mob Head. See: https://minecraft.gamepedia.com/Head#Block_entity
 			Writer.BeginCompound("Owner");
 			Writer.AddString("Id", MobHeadEntity.GetOwnerUUID());
 			Writer.AddString("Name", MobHeadEntity.GetOwnerName());
diff --git a/src/Protocol/Protocol_1_8.cpp b/src/Protocol/Protocol_1_8.cpp
index a4e85cc28..e3932db7f 100644
--- a/src/Protocol/Protocol_1_8.cpp
+++ b/src/Protocol/Protocol_1_8.cpp
@@ -3181,7 +3181,7 @@ void cProtocol_1_8_0::WriteBlockEntity(cPacketizer & a_Pkt, const cBlockEntity &
 			Writer.AddByte("Rot", MobHeadEntity.GetRotation() & 0xFF);
 			Writer.AddString("id", "Skull");  // "Tile Entity ID" - MC wiki; vanilla server always seems to send this though
 
-			// The new Block Entity format for a Mob Head. See: http://minecraft.gamepedia.com/Head#Block_entity
+			// The new Block Entity format for a Mob Head. See: https://minecraft.gamepedia.com/Head#Block_entity
 			Writer.BeginCompound("Owner");
 				Writer.AddString("Id", MobHeadEntity.GetOwnerUUID());
 				Writer.AddString("Name", MobHeadEntity.GetOwnerName());
diff --git a/src/Protocol/Protocol_1_9.cpp b/src/Protocol/Protocol_1_9.cpp
index e4b02e02c..3d4fee425 100644
--- a/src/Protocol/Protocol_1_9.cpp
+++ b/src/Protocol/Protocol_1_9.cpp
@@ -3511,7 +3511,7 @@ void cProtocol_1_9_0::WriteBlockEntity(cPacketizer & a_Pkt, const cBlockEntity &
 			Writer.AddByte("Rot", MobHeadEntity.GetRotation() & 0xFF);
 			Writer.AddString("id", "Skull");  // "Tile Entity ID" - MC wiki; vanilla server always seems to send this though
 
-			// The new Block Entity format for a Mob Head. See: http://minecraft.gamepedia.com/Head#Block_entity
+			// The new Block Entity format for a Mob Head. See: https://minecraft.gamepedia.com/Head#Block_entity
 			Writer.BeginCompound("Owner");
 				Writer.AddString("Id", MobHeadEntity.GetOwnerUUID());
 				Writer.AddString("Name", MobHeadEntity.GetOwnerName());
diff --git a/src/Statistics.cpp b/src/Statistics.cpp
index fcaf3e7bc..f29532619 100644
--- a/src/Statistics.cpp
+++ b/src/Statistics.cpp
@@ -11,7 +11,7 @@ cStatInfo cStatInfo::ms_Info[statCount] =
 {
 	// The order must match the order of enum eStatistic
 
-	// http://minecraft.gamepedia.com/Achievements
+	// https://minecraft.gamepedia.com/Achievements
 
 	/*             Type          |      Name            |  Prerequisite      */
 	cStatInfo(achOpenInv,           "achievement.openInventory"),
@@ -48,7 +48,7 @@ cStatInfo cStatInfo::ms_Info[statCount] =
 	cStatInfo(achBreedCow,          "achievement.breedCow",           achKillCow),
 	cStatInfo(achThrowDiamonds,     "achievement.diamondsToYou",      achDiamonds),
 
-	// http://minecraft.gamepedia.com/Statistics
+	// https://minecraft.gamepedia.com/Statistics
 
 	/*             Type         |     Name          */
 	cStatInfo(statGamesQuit,      "stat.leaveGame"),
diff --git a/src/WorldStorage/NBTChunkSerializer.cpp b/src/WorldStorage/NBTChunkSerializer.cpp
index 62f981eb4..8c60aac0d 100644
--- a/src/WorldStorage/NBTChunkSerializer.cpp
+++ b/src/WorldStorage/NBTChunkSerializer.cpp
@@ -380,7 +380,7 @@ void cNBTChunkSerializer::AddMobHeadEntity(cMobHeadEntity * a_MobHead)
 		m_Writer.AddByte  ("SkullType", a_MobHead->GetType() & 0xFF);
 		m_Writer.AddByte  ("Rot",       a_MobHead->GetRotation() & 0xFF);
 
-		// The new Block Entity format for a Mob Head. See: http://minecraft.gamepedia.com/Head#Block_entity
+		// The new Block Entity format for a Mob Head. See: https://minecraft.gamepedia.com/Head#Block_entity
 		m_Writer.BeginCompound("Owner");
 			m_Writer.AddString("Id", a_MobHead->GetOwnerUUID());
 			m_Writer.AddString("Name", a_MobHead->GetOwnerName());
diff --git a/src/XMLParser.h b/src/XMLParser.h
index 723ea92ed..9ddc1224e 100644
--- a/src/XMLParser.h
+++ b/src/XMLParser.h
@@ -57,7 +57,7 @@ protected:
 
 ////////////////////////////////////////////////////////////////////////////////
 // The following template has been modified from code available at
-// http://www.codeproject.com/Articles/1847/C-Wrappers-for-the-Expat-XML-Parser
+// https://www.codeproject.com/Articles/1847/C-Wrappers-for-the-Expat-XML-Parser
 // It uses templates to remove the virtual function call penalty (both size and speed) for each callback
 
 /* Usage: