pieeebot/cafekit
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 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>
This commit is contained in:
daoge
2026-03-03 03:04:10 +08:00
committed by GitHub
co-authored by Loki
parent 84c31a2331
commit b3feddfef3
2069 changed files with 264832 additions and 139512 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.World/EnderCrystal.cpp
+5 -5
View File
@@ -63,7 +63,7 @@ void EnderCrystal::tick()
int zt = Mth::floor(z);
if (level->getTile(xt, yt, zt) != Tile::fire_Id)
{
level->setTile(xt, yt, zt, Tile::fire_Id);
level->setTileAndUpdate(xt, yt, zt, Tile::fire_Id);
}
}
}
@@ -88,12 +88,12 @@ bool EnderCrystal::isPickable()
return true;
}
bool EnderCrystal::hurt(DamageSource *source, int damage)
bool EnderCrystal::hurt(DamageSource *source, float damage)
{
// 4J-PB - if the owner of the source is the enderdragon, then ignore it (where the dragon's fireball hits an endercrystal)
shared_ptr<EnderDragon> sourceIsDragon = dynamic_pointer_cast<EnderDragon>(source->getEntity());
if (isInvulnerable()) return false;
if(sourceIsDragon!=NULL)
// 4J-PB - if the owner of the source is the enderdragon, then ignore it (where the dragon's fireball hits an endercrystal)
if ( source->getEntity() != NULL && source->getEntity()->instanceof(eTYPE_ENDERDRAGON) )
{
return false;
}