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

6
Minecraft.World/ProtectionEnchantment.cpp
View File

@@ -41,7 +41,7 @@ int ProtectionEnchantment::getDamageProtection(int level, DamageSource *source)
if (type == ALL) return Mth::floor(protect * 0.75f);
if (type == FIRE && source->isFire()) return Mth::floor(protect * 1.25f);
if (type == FALL && source == DamageSource::fall) return Mth::floor(protect * 2.5f);
if (type == EXPLOSION && source == DamageSource::explosion) return Mth::floor(protect * 1.5f);
if (type == EXPLOSION && source->isExplosion() ) return Mth::floor(protect * 1.5f);
if (type == PROJECTILE && source->isProjectile()) return Mth::floor(protect * 1.5f);
return 0;
}
@@ -56,11 +56,11 @@ bool ProtectionEnchantment::isCompatibleWith(Enchantment *other) const
ProtectionEnchantment *pe = dynamic_cast<ProtectionEnchantment *>( other );
if (pe != NULL)
{
if (pe->type == this->type)
if (pe->type == type)
{
return false;
}
if (this->type == FALL || pe->type == FALL)
if (type == FALL || pe->type == FALL)
{
return true;
}