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/ExperienceOrb.cpp
+4 -3
View File
@@ -90,7 +90,7 @@ void ExperienceOrb::tick()
yd = 0.2f;
xd = (random->nextFloat() - random->nextFloat()) * 0.2f;
zd = (random->nextFloat() - random->nextFloat()) * 0.2f;
level->playSound(shared_from_this(), eSoundType_RANDOM_FIZZ, 0.4f, 2.0f + random->nextFloat() * 0.4f);
playSound(eSoundType_RANDOM_FIZZ, 0.4f, 2.0f + random->nextFloat() * 0.4f);
}
checkInTile(x, (bb->y0 + bb->y1) / 2, z);
@@ -162,8 +162,9 @@ void ExperienceOrb::burn(int dmg)
hurt(DamageSource::inFire, dmg);
}
bool ExperienceOrb::hurt(DamageSource *source, int damage)
bool ExperienceOrb::hurt(DamageSource *source, float damage)
{
if (isInvulnerable()) return false;
markHurt();
health -= damage;
if (health <= 0)
@@ -195,7 +196,7 @@ void ExperienceOrb::playerTouch(shared_ptr<Player> player)
{
player->takeXpDelay = 2;
// 4J - sound change brought forward from 1.2.3
level->playSound(shared_from_this(), eSoundType_RANDOM_ORB, 0.1f, 0.5f * ((random->nextFloat() - random->nextFloat()) * 0.7f + 1.8f));
playSound(eSoundType_RANDOM_ORB, 0.1f, 0.5f * ((random->nextFloat() - random->nextFloat()) * 0.7f + 1.8f));
player->take(shared_from_this(), 1);
player->increaseXp(value);
remove();