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

8
Minecraft.World/Village.cpp
View File

@@ -8,7 +8,7 @@
#include "BasicTypeContainers.h"
#include "Village.h"
Village::Aggressor::Aggressor(shared_ptr<Mob> mob, int timeStamp)
Village::Aggressor::Aggressor(shared_ptr<LivingEntity> mob, int timeStamp)
{
this->mob = mob;
this->timeStamp = timeStamp;
@@ -248,7 +248,7 @@ bool Village::canRemove()
return doorInfos.empty();
}
void Village::addAggressor(shared_ptr<Mob> mob)
void Village::addAggressor(shared_ptr<LivingEntity> mob)
{
//for (Aggressor a : aggressors)
for(AUTO_VAR(it, aggressors.begin()); it != aggressors.end(); ++it)
@@ -263,7 +263,7 @@ void Village::addAggressor(shared_ptr<Mob> mob)
aggressors.push_back(new Aggressor(mob, _tick));
}
shared_ptr<Mob> Village::getClosestAggressor(shared_ptr<Mob> from)
shared_ptr<LivingEntity> Village::getClosestAggressor(shared_ptr<LivingEntity> from)
{
double closestSqr = Double::MAX_VALUE;
Aggressor *closest = NULL;
@@ -279,7 +279,7 @@ shared_ptr<Mob> Village::getClosestAggressor(shared_ptr<Mob> from)
return closest != NULL ? closest->mob : nullptr;
}
shared_ptr<Player> Village::getClosestBadStandingPlayer(shared_ptr<Mob> from) // 4J Stu - Should be LivingEntity when we add that
shared_ptr<Player> Village::getClosestBadStandingPlayer(shared_ptr<LivingEntity> from)
{
double closestSqr = Double::MAX_VALUE;
shared_ptr<Player> closest = nullptr;