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

25
Minecraft.World/CaveSpider.cpp
View File

@@ -1,5 +1,7 @@
#include "stdafx.h"
#include "SharedConstants.h"
#include "net.minecraft.world.entity.ai.attributes.h"
#include "net.minecraft.world.entity.monster.h"
#include "net.minecraft.world.effect.h"
#include "net.minecraft.world.level.h"
#include "net.minecraft.world.h"
@@ -11,28 +13,23 @@
CaveSpider::CaveSpider(Level *level) : Spider(level)
{
// 4J Stu - This function call had to be moved here from the Entity ctor to ensure that the derived version of the function is called
health = getMaxHealth();
registerAttributes();
this->textureIdx = TN_MOB_CAVE_SPIDER; // 4J was "/mob/cavespider.png";
this->setSize(0.7f, 0.5f);
}
int CaveSpider::getMaxHealth()
void CaveSpider::registerAttributes()
{
return 12;
}
Spider::registerAttributes();
float CaveSpider::getModelScale()
{
return .7f;
getAttribute(SharedMonsterAttributes::MAX_HEALTH)->setBaseValue(12);
}
bool CaveSpider::doHurtTarget(shared_ptr<Entity> target)
{
if (Spider::doHurtTarget(target))
{
if ( dynamic_pointer_cast<Mob>(target) != NULL)
if ( target->instanceof(eTYPE_LIVINGENTITY) )
{
int poisonTime = 0;
if (level->difficulty <= Difficulty::EASY)
@@ -48,8 +45,9 @@ bool CaveSpider::doHurtTarget(shared_ptr<Entity> target)
poisonTime = 15;
}
if (poisonTime > 0) {
dynamic_pointer_cast<Mob>(target)->addEffect(new MobEffectInstance(MobEffect::poison->id, poisonTime * SharedConstants::TICKS_PER_SECOND, 0));
if (poisonTime > 0)
{
dynamic_pointer_cast<LivingEntity>(target)->addEffect(new MobEffectInstance(MobEffect::poison->id, poisonTime * SharedConstants::TICKS_PER_SECOND, 0));
}
}
@@ -58,7 +56,8 @@ bool CaveSpider::doHurtTarget(shared_ptr<Entity> target)
return false;
}
void CaveSpider::finalizeMobSpawn()
MobGroupData *CaveSpider::finalizeMobSpawn(MobGroupData *groupData, int extraData /*= 0*/) // 4J Added extraData param
{
// do nothing
return groupData;
}