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

80
Minecraft.World/MobEffectInstance.cpp
View File

@@ -6,6 +6,10 @@ void MobEffectInstance::_init(int id, int duration, int amplifier)
this->id = id;
this->duration = duration;
this->amplifier = amplifier;
splash = false;
ambient = false;
noCounter = false;
}
MobEffectInstance::MobEffectInstance(int id)
@@ -23,27 +27,40 @@ MobEffectInstance::MobEffectInstance(int id, int duration, int amplifier)
_init(id,duration,amplifier);
}
MobEffectInstance::MobEffectInstance(int id, int duration, int amplifier, bool ambient)
{
_init(id,duration,amplifier);
this->ambient = ambient;
}
MobEffectInstance::MobEffectInstance(MobEffectInstance *copy)
{
this->id = copy->id;
this->duration = copy->duration;
this->amplifier = copy->amplifier;
this->splash = copy->splash;
this->ambient = copy->ambient;
this->noCounter = copy->noCounter;
}
void MobEffectInstance::update(MobEffectInstance *takeOver)
{
if (this->id != takeOver->id)
if (id != takeOver->id)
{
app.DebugPrintf("This method should only be called for matching effects!");
}
if (takeOver->amplifier > this->amplifier)
if (takeOver->amplifier > amplifier)
{
this->amplifier = takeOver->amplifier;
this->duration = takeOver->duration;
amplifier = takeOver->amplifier;
duration = takeOver->duration;
}
else if (takeOver->amplifier == this->amplifier && this->duration < takeOver->duration)
else if (takeOver->amplifier == amplifier && duration < takeOver->duration)
{
this->duration = takeOver->duration;
duration = takeOver->duration;
}
else if (!takeOver->ambient && ambient)
{
ambient = takeOver->ambient;
}
}
@@ -62,13 +79,28 @@ int MobEffectInstance::getAmplifier()
return amplifier;
}
bool MobEffectInstance::isSplash()
{
return splash;
}
void MobEffectInstance::setSplash(bool splash)
{
this->splash = splash;
}
bool MobEffectInstance::isAmbient()
{
return ambient;
}
/**
* Runs the effect on a Mob target.
*
* @param target
* @return True if the effect is still active.
*/
bool MobEffectInstance::tick(shared_ptr<Mob> target)
bool MobEffectInstance::tick(shared_ptr<LivingEntity> target)
{
if (duration > 0)
{
@@ -86,7 +118,7 @@ int MobEffectInstance::tickDownDuration()
return --duration;
}
void MobEffectInstance::applyEffect(shared_ptr<Mob> mob)
void MobEffectInstance::applyEffect(shared_ptr<LivingEntity> mob)
{
if (duration > 0)
{
@@ -133,7 +165,35 @@ wstring MobEffectInstance::toString()
}
// Was bool equals(Object obj)
bool MobEffectInstance::equals(MobEffectInstance *obj)
bool MobEffectInstance::equals(MobEffectInstance *instance)
{
return this->id == obj->id && this->amplifier == obj->amplifier && this->duration == obj->duration;
return id == instance->id && amplifier == instance->amplifier && duration == instance->duration && splash == instance->splash && ambient == instance->ambient;
}
CompoundTag *MobEffectInstance::save(CompoundTag *tag)
{
tag->putByte(L"Id", (byte) getId());
tag->putByte(L"Amplifier", (byte) getAmplifier());
tag->putInt(L"Duration", getDuration());
tag->putBoolean(L"Ambient", isAmbient());
return tag;
}
MobEffectInstance *MobEffectInstance::load(CompoundTag *tag)
{
int id = tag->getByte(L"Id");
int amplifier = tag->getByte(L"Amplifier");
int duration = tag->getInt(L"Duration");
boolean ambient = tag->getBoolean(L"Ambient");
return new MobEffectInstance(id, duration, amplifier, ambient);
}
void MobEffectInstance::setNoCounter(bool noCounter)
{
this->noCounter = noCounter;
}
bool MobEffectInstance::isNoCounter()
{
return noCounter;
}