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

December 2014 files

Browse Source
This commit is contained in:
Loki Rautio
2026-03-01 11:00:23 -06:00
parent b691c43c44
commit 8fd3ac6e37
2049 changed files with 260190 additions and 134787 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;
}