feat: TU19 (Dec 2014) Features & Content (#155)

* try to resolve merge conflict

* feat: TU19 (Dec 2014) Features & Content (#32)

* December 2014 files

* Working release build

* Fix compilation issues

* Add sound to Windows64Media

* Add DLC content and force Tutorial DLC

* Revert "Add DLC content and force Tutorial DLC"

This reverts commit 97a43994725008e35fceb984d5549df9c8cea470.

* Disable broken light packing

* Disable breakpoint during DLC texture map load

Allows DLC loading but the DLC textures are still broken

* Fix post build not working

* ...

* fix vs2022 build

* fix cmake build

---------

Co-authored-by: Loki <lokirautio@gmail.com>

1 files changed, 17 insertions, 8 deletions

diff --git a/Minecraft.World/ThrownEnderpearl.cpp b/Minecraft.World/ThrownEnderpearl.cpp
index 1cddfb1f..1035bffd 100644
--- a/Minecraft.World/ThrownEnderpearl.cpp
+++ b/Minecraft.World/ThrownEnderpearl.cpp
@@ -16,7 +16,7 @@ ThrownEnderpearl::ThrownEnderpearl(Level *level) : Throwable(level)
 	this->defineSynchedData();
 }
 
-ThrownEnderpearl::ThrownEnderpearl(Level *level, shared_ptr<Mob> mob) : Throwable(level,mob)
+ThrownEnderpearl::ThrownEnderpearl(Level *level, shared_ptr<LivingEntity> mob) : Throwable(level,mob)
 {
 	// 4J Stu - This function call had to be moved here from the Entity ctor to ensure that
 	// the derived version of the function is called
@@ -34,7 +34,7 @@ void ThrownEnderpearl::onHit(HitResult *res)
 {
 	if (res->entity != NULL)
 	{
-		DamageSource *damageSource = DamageSource::thrown(shared_from_this(), owner);
+		DamageSource *damageSource = DamageSource::thrown(shared_from_this(), getOwner() );
 		res->entity->hurt(damageSource, 0);
 		delete damageSource;
 	}
@@ -47,14 +47,23 @@ void ThrownEnderpearl::onHit(HitResult *res)
 	{
 		// Fix for #67486 - TCR #001: BAS Game Stability: Customer Encountered: TU8: Code: Gameplay: The title crashes on Host's console when Client Player leaves the game before the Ender Pearl thrown by him touches the ground.
 		// If the owner has been removed, then ignore
-		shared_ptr<ServerPlayer> serverPlayer = dynamic_pointer_cast<ServerPlayer>(owner);
-		if (serverPlayer != NULL && !serverPlayer->removed)
+
+		// 4J-JEV: Cheap type check first.
+		if ( (getOwner() != NULL) && getOwner()->instanceof(eTYPE_SERVERPLAYER) )
 		{
-			if(!serverPlayer->connection->done && serverPlayer->level == this->level)
+			shared_ptr<ServerPlayer> serverPlayer = dynamic_pointer_cast<ServerPlayer>(getOwner() );
+			if (!serverPlayer->removed)
 			{
-				owner->teleportTo(x, y, z);
-				owner->fallDistance = 0;
-				owner->hurt(DamageSource::fall, 5);
+				if(!serverPlayer->connection->done && serverPlayer->level == this->level)
+				{
+					if (getOwner()->isRiding())
+					{
+						getOwner()->ride(nullptr);
+					}
+					getOwner()->teleportTo(x, y, z);
+					getOwner()->fallDistance = 0;
+					getOwner()->hurt(DamageSource::fall, 5);
+				}
 			}
 		}
 		remove();