Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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 97a4399472.

* 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>
This commit is contained in:
daoge
2026-03-03 03:04:10 +08:00
committed by GitHub
parent 84c31a2331
commit b3feddfef3
2069 changed files with 264842 additions and 139522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Minecraft.World/ThrownEnderpearl.cpp
View File

@@ -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();