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

15
Minecraft.World/PotionBrewing.cpp
View File

@@ -218,6 +218,17 @@ int PotionBrewing::getColorValue(vector<MobEffectInstance *> *effects)
return ((int) red) << 16 | ((int) green) << 8 | ((int) blue);
}
bool PotionBrewing::areAllEffectsAmbient(vector<MobEffectInstance *> *effects)
{
for(AUTO_VAR(it, effects->begin()); it != effects->end(); ++it)
{
MobEffectInstance *effect = *it;
if (!effect->isAmbient()) return false;
}
return true;
}
int PotionBrewing::getColorValue(int brew, bool includeDisabledEffects)
{
if (!includeDisabledEffects)
@@ -598,7 +609,9 @@ vector<MobEffectInstance *> *PotionBrewing::getEffects(int brew, bool includeDis
{
list = new vector<MobEffectInstance *>();
}
list->push_back(new MobEffectInstance(effect->getId(), duration, amplifier));
MobEffectInstance *instance = new MobEffectInstance(effect->getId(), duration, amplifier);
if ((brew & THROWABLE_MASK) != 0) instance->setSplash(true);
list->push_back(instance);
}
}