5 files changed, 12 insertions, 25 deletions
diff --git a/src/Entities/ArrowEntity.cpp b/src/Entities/ArrowEntity.cpp
index 0fbbfb681..3c1fabb1b 100644
--- a/src/Entities/ArrowEntity.cpp
+++ b/src/Entities/ArrowEntity.cpp
@@ -72,14 +72,8 @@ bool cArrowEntity::CanPickup(const cPlayer & a_Player) const
 
 void cArrowEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace)
 {
-	if (GetSpeed().EqualsEps(Vector3d(0, 0, 0), 0.0000001))
-	{
-		SetSpeed(GetLookVector().NormalizeCopy() * 0.1);  // Ensure that no division by zero happens later
-	}
-
 	Vector3d Hit = a_HitPos;
-	Vector3d SinkMovement = (GetSpeed() / 1000);
-	Hit += SinkMovement * (0.0005 / SinkMovement.Length());  // Make arrow sink into block a centimetre so it lodges (but not to far so it goes black clientside)
+	Hit += GetSpeed().NormalizeCopy() / 100000;  // Make arrow sink into block a bit so it lodges (TODO: investigate how to stop them going so far so that they become black clientside)
 
 	super::OnHitSolidBlock(Hit, a_HitFace);
 	Vector3i BlockHit = Hit.Floor();
@@ -195,11 +189,6 @@ void cArrowEntity::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
 	
 	if (m_IsInGround)
 	{
-		// When an arrow hits, the client doesn't think its in the ground and keeps on moving, IF BroadcastMovementUpdate() and TeleportEntity was called during flight, AT ALL
-		// Fix is to simply not sync with the client and send a teleport to confirm pos after arrow has stabilised (around 1 sec after landing)
-		// We can afford to do this because xoft's algorithm for trajectory is near perfect, so things are pretty close anyway without sync
-		// Besides, this seems to be what the vanilla server does, note how arrows teleport half a second after they hit to the server position
-		
 		if (!m_HasTeleported)  // Sent a teleport already, don't do again
 		{
 			if (m_HitGroundTimer > std::chrono::milliseconds(500))
diff --git a/src/Entities/Boat.cpp b/src/Entities/Boat.cpp
index 6d8b4ef31..6177eb32f 100644
--- a/src/Entities/Boat.cpp
+++ b/src/Entities/Boat.cpp
@@ -98,7 +98,7 @@ void cBoat::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
 
 	SetSpeed(GetSpeed() * 0.97);  // Slowly decrease the speed
 
-	if ((POSY_TOINT < 0) || (POSY_TOINT > cChunkDef::Height))
+	if ((POSY_TOINT < 0) || (POSY_TOINT >= cChunkDef::Height))
 	{
 		return;
 	}
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 329537c92..c8df6b4b1 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -1264,7 +1264,7 @@ bool cEntity::DetectPortal()
 {
 	if (GetWorld()->GetDimension() == dimOverworld)
 	{
-		if (GetWorld()->GetNetherWorldName().empty() && GetWorld()->GetEndWorldName().empty())
+		if (GetWorld()->GetLinkedNetherWorldName().empty() && GetWorld()->GetLinkedEndWorldName().empty())
 		{
 			// Teleportation to either dimension not enabled, don't bother proceeding
 			return false;
@@ -1315,7 +1315,7 @@ bool cEntity::DetectPortal()
 				}
 				else
 				{
-					if (GetWorld()->GetNetherWorldName().empty())
+					if (GetWorld()->GetLinkedNetherWorldName().empty())
 					{
 						return false;
 					}
@@ -1328,7 +1328,7 @@ bool cEntity::DetectPortal()
 						((cPlayer *)this)->GetClientHandle()->SendRespawn(dimNether);
 					}
 					
-					return MoveToWorld(cRoot::Get()->CreateAndInitializeWorld(GetWorld()->GetNetherWorldName(), dimNether, GetWorld()->GetName()), false);
+					return MoveToWorld(cRoot::Get()->CreateAndInitializeWorld(GetWorld()->GetLinkedNetherWorldName(), dimNether, GetWorld()->GetName()), false);
 				}
 			}
 			case E_BLOCK_END_PORTAL:
@@ -1359,7 +1359,7 @@ bool cEntity::DetectPortal()
 				}
 				else
 				{
-					if (GetWorld()->GetEndWorldName().empty())
+					if (GetWorld()->GetLinkedEndWorldName().empty())
 					{
 						return false;
 					}
@@ -1372,7 +1372,7 @@ bool cEntity::DetectPortal()
 						((cPlayer *)this)->GetClientHandle()->SendRespawn(dimEnd);
 					}
 
-					return MoveToWorld(cRoot::Get()->CreateAndInitializeWorld(GetWorld()->GetEndWorldName(), dimEnd, GetWorld()->GetName()), false);
+					return MoveToWorld(cRoot::Get()->CreateAndInitializeWorld(GetWorld()->GetLinkedEndWorldName(), dimEnd, GetWorld()->GetName()), false);
 				}
 				
 			}
diff --git a/src/Entities/FallingBlock.cpp b/src/Entities/FallingBlock.cpp
index 75105a0cd..7301a3c9d 100644
--- a/src/Entities/FallingBlock.cpp
+++ b/src/Entities/FallingBlock.cpp
@@ -77,7 +77,10 @@ void cFallingBlock::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
 		);
 		*/
 
-		cSandSimulator::FinishFalling(m_World, BlockX, BlockY + 1, BlockZ, m_BlockType, m_BlockMeta);
+		if (BlockY < cChunkDef::Height - 1)
+		{
+			cSandSimulator::FinishFalling(m_World, BlockX, BlockY + 1, BlockZ, m_BlockType, m_BlockMeta);
+		}
 		Destroy(true);
 		return;
 	}
diff --git a/src/Entities/ProjectileEntity.cpp b/src/Entities/ProjectileEntity.cpp
index 7af2186c1..4684e3e09 100644
--- a/src/Entities/ProjectileEntity.cpp
+++ b/src/Entities/ProjectileEntity.cpp
@@ -334,12 +334,7 @@ AString cProjectileEntity::GetMCAClassName(void) const
 void cProjectileEntity::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
 {
 	super::Tick(a_Dt, a_Chunk);
-	
-	// TODO: see BroadcastMovementUpdate; RelativeMove packet jerkiness affects projectiles too (cause of sympton described in cArrowEntity::Tick())
-	if (GetProjectileKind() != pkArrow)
-	{
-		BroadcastMovementUpdate();
-	}
+	BroadcastMovementUpdate();
 }