mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-05-27 01:13:51 +00:00
feat: TU19 (Dec 2014) Features & Content (#155)
* 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:
parent
84c31a2331
commit
b3feddfef3
2069 changed files with 264842 additions and 139522 deletions
|
|
@ -7,16 +7,16 @@
|
|||
#include "net.minecraft.world.phys.h"
|
||||
#include "FollowOwnerGoal.h"
|
||||
|
||||
FollowOwnerGoal::FollowOwnerGoal(TamableAnimal *tamable, float speed, float startDistance, float stopDistance)
|
||||
FollowOwnerGoal::FollowOwnerGoal(TamableAnimal *tamable, double speedModifier, float startDistance, float stopDistance)
|
||||
{
|
||||
owner = weak_ptr<Mob>();
|
||||
timeToRecalcPath = 0;
|
||||
oldAvoidWater = false;
|
||||
|
||||
this->tamable = tamable;
|
||||
this->level = tamable->level;
|
||||
this->speed = speed;
|
||||
this->navigation = tamable->getNavigation();
|
||||
level = tamable->level;
|
||||
this->speedModifier = speedModifier;
|
||||
navigation = tamable->getNavigation();
|
||||
this->startDistance = startDistance;
|
||||
this->stopDistance = stopDistance;
|
||||
setRequiredControlFlags(Control::MoveControlFlag | Control::LookControlFlag);
|
||||
|
|
@ -24,11 +24,11 @@ FollowOwnerGoal::FollowOwnerGoal(TamableAnimal *tamable, float speed, float star
|
|||
|
||||
bool FollowOwnerGoal::canUse()
|
||||
{
|
||||
shared_ptr<Mob> owner = tamable->getOwner();
|
||||
shared_ptr<LivingEntity> owner = dynamic_pointer_cast<LivingEntity>( tamable->getOwner() );
|
||||
if (owner == NULL) return false;
|
||||
if (tamable->isSitting()) return false;
|
||||
if (tamable->distanceToSqr(owner) < startDistance * startDistance) return false;
|
||||
this->owner = weak_ptr<Mob>(owner);
|
||||
this->owner = weak_ptr<LivingEntity>(owner);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -59,7 +59,8 @@ void FollowOwnerGoal::tick()
|
|||
if (--timeToRecalcPath > 0) return;
|
||||
timeToRecalcPath = 10;
|
||||
|
||||
if (navigation->moveTo(owner.lock(), speed)) return;
|
||||
if (navigation->moveTo(owner.lock(), speedModifier)) return;
|
||||
if (tamable->isLeashed()) return;
|
||||
if (tamable->distanceToSqr(owner.lock()) < TeleportDistance * TeleportDistance) return;
|
||||
|
||||
// find a good spawn position nearby the owner
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue