fix: stupid

Minecraft.Client/Level/MultiPlayerLevel.cpp

@@ -818,7 +818,7 @@ void MultiPlayerLevel::removeAllPendingEntityRemovals()
 		{
 			if (e->riding->removed || e->riding->rider.lock() != e)
 			{
-				e->riding->rider = std::<Entity>();
+				e->riding->rider = std::weak_ptr<Entity>();
 				e->riding = nullptr;
 			}
 			else 

Minecraft.Client/Platform/Durango/Network/ChatIntegrationLayer.cpp

@@ -63,7 +63,7 @@ void ChatIntegrationLayer::InitializeChatManager(
 
 	InitializeCriticalSection(&m_csAddedUsers);
 
-    std::<ChatIntegrationLayer> weakPtrToThis = shared_from_this();
+    std::weak_ptr<ChatIntegrationLayer> weakPtrToThis = shared_from_this();
 
 #ifdef PROFILE
     m_chatManager->ChatSettings->PerformanceCountersEnabled = true;

Minecraft.World/AI/Control/Sensing.cpp

@@ -29,7 +29,7 @@ bool Sensing::canSee(std::shared_ptr<Entity> target)
 	//util.Timer.push("canSee");
 	bool canSee = mob->canSee(target);
 	//util.Timer.pop();
-	if (canSee) seen.push_back(std::<Entity>(target));
-	else unseen.push_back(std::<Entity>(target));
+	if (canSee) seen.push_back(std::weak_ptr<Entity>(target));
+	else unseen.push_back(std::weak_ptr<Entity>(target));
 	return canSee;
 }

Minecraft.World/AI/Control/Sensing.h

@@ -4,8 +4,8 @@ class Sensing
 {
 private:
 	Mob *mob;
-	std::vector<std::<Entity> > seen;
-	std::vector<std::<Entity> > unseen;
+	std::vector<std::weak_ptr<Entity> > seen;
+	std::vector<std::weak_ptr<Entity> > unseen;
 
 public:
 	Sensing(Mob *mob);

Minecraft.World/AI/Goals/ArrowAttackGoal.cpp

@@ -12,7 +12,7 @@
 ArrowAttackGoal::ArrowAttackGoal(Mob *mob, float speed, int projectileType, int attackInterval)
 {
 	// 4J Init
-	target = std::<Mob>();
+	target = std::weak_ptr<Mob>();
 	attackTime = 0;
 	seeTime = 0;
 
@@ -28,7 +28,7 @@ bool ArrowAttackGoal::canUse()
 {
 	std::shared_ptr<Mob> bestTarget = mob->getTarget();
 	if (bestTarget == NULL) return false;
-	target = std::<Mob>(bestTarget);
+	target = std::weak_ptr<Mob>(bestTarget);
 	return true;
 }
 
@@ -39,7 +39,7 @@ bool ArrowAttackGoal::canContinueToUse()
 
 void ArrowAttackGoal::stop()
 {
-	target = std::<Mob>();
+	target = std::weak_ptr<Mob>();
 }
 
 void ArrowAttackGoal::tick()

Minecraft.World/AI/Goals/ArrowAttackGoal.h

@@ -10,7 +10,7 @@ public:
 
 	Level *level;
 	Mob *mob; // Owner of this goal
-	std::<Mob> target;
+	std::weak_ptr<Mob> target;
 	int attackTime;
 	float speed;
 	int seeTime;

Minecraft.World/AI/Goals/AvoidPlayerGoal.cpp

@@ -20,7 +20,7 @@ AvoidPlayerGoal::AvoidPlayerGoal(PathfinderMob *mob, const std::type_info& avoid
 	this->pathNav = mob->getNavigation();
 	setRequiredControlFlags(Control::MoveControlFlag);
 
-	toAvoid = std::<Entity>();
+	toAvoid = std::weak_ptr<Entity>();
 	path = NULL;
 }
 
@@ -35,7 +35,7 @@ bool AvoidPlayerGoal::canUse()
 	{
 		std::shared_ptr<TamableAnimal> tamableAnimal = dynamic_pointer_cast<TamableAnimal>(mob->shared_from_this());
 		if (tamableAnimal != NULL && tamableAnimal->isTame()) return false;
-		toAvoid = std::<Entity>(mob->level->getNearestPlayer(mob->shared_from_this(), maxDist));
+		toAvoid = std::weak_ptr<Entity>(mob->level->getNearestPlayer(mob->shared_from_this(), maxDist));
 		if (toAvoid.lock() == NULL) return false;
 	}
 	else
@@ -46,7 +46,7 @@ bool AvoidPlayerGoal::canUse()
 			delete entities;
 			return false;
 		}
-		toAvoid = std::<Entity>(entities->at(0));
+		toAvoid = std::weak_ptr<Entity>(entities->at(0));
 		delete entities;
 	}
 
@@ -75,7 +75,7 @@ void AvoidPlayerGoal::start()
 
 void AvoidPlayerGoal::stop()
 {
-	toAvoid = std::<Entity>();
+	toAvoid = std::weak_ptr<Entity>();
 }
 
 void AvoidPlayerGoal::tick()

Minecraft.World/AI/Goals/AvoidPlayerGoal.h

@@ -11,7 +11,7 @@ class AvoidPlayerGoal : public Goal
 private:
 	PathfinderMob *mob; // Owner of this goal
 	float walkSpeed, sprintSpeed;
-	std::<Entity> toAvoid;
+	std::weak_ptr<Entity> toAvoid;
 	float maxDist;
 	Path *path;
 	PathNavigation *pathNav;

Minecraft.World/AI/Goals/BegGoal.cpp

@@ -8,7 +8,7 @@
 
 BegGoal::BegGoal(Wolf *wolf, float lookDistance)
 {
-	player = std::<Player>();
+	player = std::weak_ptr<Player>();
 	lookTime = 0;
 
 	this->wolf = wolf;
@@ -19,7 +19,7 @@ BegGoal::BegGoal(Wolf *wolf, float lookDistance)
 
 bool BegGoal::canUse()
 {
-	player = std::<Player>(level->getNearestPlayer(wolf->shared_from_this(), lookDistance));
+	player = std::weak_ptr<Player>(level->getNearestPlayer(wolf->shared_from_this(), lookDistance));
 	if (player.lock() == NULL) return false;
 	wolf->setDespawnProtected();
 	return playerHoldingInteresting(player.lock());
@@ -42,7 +42,7 @@ void BegGoal::start()
 void BegGoal::stop()
 {
 	wolf->setIsInterested(false);
-	player = std::<Player>();
+	player = std::weak_ptr<Player>();
 }
 
 void BegGoal::tick()

Minecraft.World/AI/Goals/BegGoal.h

@@ -8,7 +8,7 @@ class BegGoal : public Goal
 {
 private:
 	Wolf *wolf; // Owner of this goal
-	std::<Player> player;
+	std::weak_ptr<Player> player;
 	Level *level;
 	float lookDistance;
 	int lookTime;

Minecraft.World/AI/Goals/BreedGoal.cpp

@@ -11,7 +11,7 @@
 
 BreedGoal::BreedGoal(Animal *animal, float speed)
 {
-	partner = std::<Animal>();
+	partner = std::weak_ptr<Animal>();
 	loveTime = 0;
 
 	this->animal = animal;
@@ -23,7 +23,7 @@ BreedGoal::BreedGoal(Animal *animal, float speed)
 bool BreedGoal::canUse()
 {
 	if (!animal->isInLove()) return false;
-	partner = std::<Animal>(getFreePartner());
+	partner = std::weak_ptr<Animal>(getFreePartner());
 	return partner.lock() != NULL;
 }
 
@@ -34,7 +34,7 @@ bool BreedGoal::canContinueToUse()
 
 void BreedGoal::stop()
 {
-	partner = std::<Animal>();
+	partner = std::weak_ptr<Animal>();
 	loveTime = 0;
 }
 

Minecraft.World/AI/Goals/BreedGoal.h

@@ -10,7 +10,7 @@ class BreedGoal : public Goal
 private:
 	Animal *animal; // Owner of this goal
 	Level *level;
-	std::<Animal> partner;
+	std::weak_ptr<Animal> partner;
 	int loveTime;
 	float speed;
 

Minecraft.World/AI/Goals/DefendVillageTargetGoal.cpp

@@ -13,7 +13,7 @@ bool DefendVillageTargetGoal::canUse()
 {
 	std::shared_ptr<Village> village = golem->getVillage();
 	if (village == NULL) return false;
-	potentialTarget = std::<Mob>(village->getClosestAggressor(dynamic_pointer_cast<Mob>(golem->shared_from_this())));
+	potentialTarget = std::weak_ptr<Mob>(village->getClosestAggressor(dynamic_pointer_cast<Mob>(golem->shared_from_this())));
 	return canAttack(potentialTarget.lock(), false);
 }
 

Minecraft.World/AI/Goals/DefendVillageTargetGoal.h

@@ -8,7 +8,7 @@ class DefendVillageTargetGoal : public TargetGoal
 {
 private:
 	VillagerGolem *golem; // Owner of this goal
-	std::<Mob> potentialTarget;
+	std::weak_ptr<Mob> potentialTarget;
 
 public:
 	DefendVillageTargetGoal(VillagerGolem *golem);

Minecraft.World/AI/Goals/FollowOwnerGoal.cpp

@@ -9,7 +9,7 @@
 
 FollowOwnerGoal::FollowOwnerGoal(TamableAnimal *tamable, float speed, float startDistance, float stopDistance)
 {
-	owner = std::<Mob>();
+	owner = std::weak_ptr<Mob>();
 	timeToRecalcPath = 0;
 	oldAvoidWater = false;
 
@@ -28,7 +28,7 @@ bool FollowOwnerGoal::canUse()
 	if (owner == NULL) return false;
 	if (tamable->isSitting()) return false;
 	if (tamable->distanceToSqr(owner) < startDistance * startDistance) return false;
-	this->owner = std::<Mob>(owner);
+	this->owner = std::weak_ptr<Mob>(owner);
 	return true;
 }
 
@@ -46,7 +46,7 @@ void FollowOwnerGoal::start()
 
 void FollowOwnerGoal::stop()
 {
-	owner = std::<Mob>();
+	owner = std::weak_ptr<Mob>();
 	navigation->stop();
 	tamable->getNavigation()->setAvoidWater(oldAvoidWater);
 }

Minecraft.World/AI/Goals/FollowOwnerGoal.h

@@ -12,7 +12,7 @@ public:
 
 private:
 	TamableAnimal *tamable; // Owner of this goal
-	std::<Mob> owner;
+	std::weak_ptr<Mob> owner;
 	Level *level;
 	float speed;
 	PathNavigation *navigation;

Minecraft.World/AI/Goals/FollowParentGoal.cpp

@@ -35,7 +35,7 @@ bool FollowParentGoal::canUse()
 
 	if (closest == NULL) return false;
 	if (closestDistSqr < 3 * 3) return false;
-	parent = std::<Animal>(closest);
+	parent = std::weak_ptr<Animal>(closest);
 	return true;
 }
 
@@ -54,7 +54,7 @@ void FollowParentGoal::start()
 
 void FollowParentGoal::stop()
 {
-	parent = std::<Animal>();
+	parent = std::weak_ptr<Animal>();
 }
 
 void FollowParentGoal::tick()

Minecraft.World/AI/Goals/FollowParentGoal.h

@@ -8,7 +8,7 @@ class FollowParentGoal : public Goal
 {
 private:
 	Animal *animal; // Owner of this goal
-	std::<Animal> parent;
+	std::weak_ptr<Animal> parent;
 	float speed;
 	int timeToRecalcPath;
 

Minecraft.World/AI/Goals/LeapAtTargetGoal.cpp

@@ -5,7 +5,7 @@
 
 LeapAtTargetGoal::LeapAtTargetGoal(Mob *mob, float yd)
 {
-	target = std::<Mob>();
+	target = std::weak_ptr<Mob>();
 
 	this->mob = mob;
 	this->yd = yd;
@@ -14,7 +14,7 @@ LeapAtTargetGoal::LeapAtTargetGoal(Mob *mob, float yd)
 
 bool LeapAtTargetGoal::canUse()
 {
-	target = std::<Mob>(mob->getTarget());
+	target = std::weak_ptr<Mob>(mob->getTarget());
 	if (target.lock() == NULL) return false;
 	double d = mob->distanceToSqr(target.lock());
 	if (d < 2 * 2 || d > 4 * 4) return false;

Minecraft.World/AI/Goals/LeapAtTargetGoal.h

@@ -6,7 +6,7 @@ class LeapAtTargetGoal : public Goal
 {
 private:
     Mob *mob; // Owner of this goal
-    std::<Mob> target;
+    std::weak_ptr<Mob> target;
     float yd;
 
 public:

Minecraft.World/AI/Goals/LookAtPlayerGoal.cpp

@@ -29,7 +29,7 @@ bool LookAtPlayerGoal::canUse()
 {
 	if (mob->getRandom()->nextFloat() >= probability) return false;
 	if (lookAtType == typeid(Player)) lookAt = mob->level->getNearestPlayer(mob->shared_from_this(), lookDistance);
-	else lookAt = std::<Entity>(mob->level->getClosestEntityOfClass(lookAtType, mob->bb->grow(lookDistance, 3, lookDistance), mob->shared_from_this()));
+	else lookAt = std::weak_ptr<Entity>(mob->level->getClosestEntityOfClass(lookAtType, mob->bb->grow(lookDistance, 3, lookDistance), mob->shared_from_this()));
 	return lookAt.lock() != NULL;
 }
 
@@ -47,7 +47,7 @@ void LookAtPlayerGoal::start()
 
 void LookAtPlayerGoal::stop()
 {
-	lookAt = std::<Entity>();
+	lookAt = std::weak_ptr<Entity>();
 }
 
 void LookAtPlayerGoal::tick()

Minecraft.World/AI/Goals/LookAtPlayerGoal.h

@@ -11,7 +11,7 @@ private:
 	Mob *mob; // Owner of this goal
 
 protected:
-	std::<Entity> lookAt;
+	std::weak_ptr<Entity> lookAt;
 
 private:
 	float lookDistance;

Minecraft.World/AI/Goals/LookAtTradingPlayerGoal.cpp

@@ -12,7 +12,7 @@ bool LookAtTradingPlayerGoal::canUse()
 {
 	if (villager->isTrading())
 	{
-		lookAt = std::<Entity>(dynamic_pointer_cast<Entity>(villager->getTradingPlayer()));
+		lookAt = std::weak_ptr<Entity>(dynamic_pointer_cast<Entity>(villager->getTradingPlayer()));
 		return true;
 	}
 	return false;

Minecraft.World/AI/Goals/MakeLoveGoal.cpp

@@ -10,8 +10,8 @@
 
 MakeLoveGoal::MakeLoveGoal(Villager *villager)
 {
-	village = std::<Village>();
-	partner = std::<Villager>();
+	village = std::weak_ptr<Village>();
+	partner = std::weak_ptr<Villager>();
 	loveMakingTime = 0;
 
 	this->villager = villager;
@@ -32,7 +32,7 @@ bool MakeLoveGoal::canUse()
 	std::shared_ptr<Entity> mate = level->getClosestEntityOfClass(typeid(Villager), villager->bb->grow(8, 3, 8), villager->shared_from_this());
 	if (mate == NULL) return false;
 
-	partner = std::<Villager>(dynamic_pointer_cast<Villager>(mate));
+	partner = std::weak_ptr<Villager>(dynamic_pointer_cast<Villager>(mate));
 	if (partner.lock()->getAge() != 0) return false;
 
 	return true;
@@ -46,8 +46,8 @@ void MakeLoveGoal::start()
 
 void MakeLoveGoal::stop()
 {
-	village = std::<Village>();
-	partner = std::<Villager>();
+	village = std::weak_ptr<Village>();
+	partner = std::weak_ptr<Villager>();
 	villager->setInLove(false);
 }
 

Minecraft.World/AI/Goals/MakeLoveGoal.h

@@ -9,10 +9,10 @@ class MakeLoveGoal : public Goal
 {
 private:
 	Villager *villager; // Owner of this goal
-	std::<Villager> partner;
+	std::weak_ptr<Villager> partner;
 	Level *level;
 	int loveMakingTime;
-	std::<Village> village;
+	std::weak_ptr<Village> village;
 
 public:
 	MakeLoveGoal(Villager *villager);

Minecraft.World/AI/Goals/MeleeAttackGoal.cpp

@@ -45,7 +45,7 @@ bool MeleeAttackGoal::canUse()
 	if (bestTarget == NULL) return false;
 	if(!bestTarget->isAlive()) return false;
 	if (attackType != eTYPE_NOTSET && (attackType & bestTarget->GetType()) != attackType) return false;
-	target = std::<Mob>(bestTarget);
+	target = std::weak_ptr<Mob>(bestTarget);
 	delete path;
 	path = mob->getNavigation()->createPath(target.lock());
 	return path != NULL;
@@ -70,7 +70,7 @@ void MeleeAttackGoal::start()
 
 void MeleeAttackGoal::stop()
 {
-	target = std::<Mob>();
+	target = std::weak_ptr<Mob>();
 	mob->getNavigation()->stop();
 }
 

Minecraft.World/AI/Goals/MeleeAttackGoal.h

@@ -11,7 +11,7 @@ class MeleeAttackGoal : public Goal
 private:
 	Level *level;
 	Mob *mob; // Owner of this goal
-	std::<Mob> target;
+	std::weak_ptr<Mob> target;
 
 	int attackTime;
 	float speed;

Minecraft.World/AI/Goals/MoveIndoorsGoal.cpp

@@ -39,7 +39,7 @@ void MoveIndoorsGoal::start()
 	std::shared_ptr<DoorInfo> _doorInfo = doorInfo.lock();
 	if( _doorInfo == NULL )
 	{
-		doorInfo = std::<DoorInfo>();
+		doorInfo = std::weak_ptr<DoorInfo>();
 		return;
 	}
 	if (mob->distanceToSqr(_doorInfo->getIndoorX(), _doorInfo->y, _doorInfo->getIndoorZ()) > 16 * 16)
@@ -55,11 +55,11 @@ void MoveIndoorsGoal::stop()
 	std::shared_ptr<DoorInfo> _doorInfo = doorInfo.lock();
 	if( _doorInfo == NULL )
 	{
-		doorInfo = std::<DoorInfo>();
+		doorInfo = std::weak_ptr<DoorInfo>();
 		return;
 	}
 
 	insideX = _doorInfo->getIndoorX();
 	insideZ = _doorInfo->getIndoorZ();
-	doorInfo = std::<DoorInfo>();
+	doorInfo = std::weak_ptr<DoorInfo>();
 }

Minecraft.World/AI/Goals/MoveIndoorsGoal.h

@@ -9,7 +9,7 @@ class MoveIndoorsGoal : public Goal
 {
 private:
 	PathfinderMob *mob;
-	std::<DoorInfo> doorInfo;
+	std::weak_ptr<DoorInfo> doorInfo;
 	int insideX, insideZ;
 
 public:

Minecraft.World/AI/Goals/MoveThroughVillageGoal.cpp

@@ -12,7 +12,7 @@
 MoveThroughVillageGoal::MoveThroughVillageGoal(PathfinderMob *mob, float speed, bool onlyAtNight)
 {
 	path = NULL;
-	doorInfo = std::<DoorInfo>();
+	doorInfo = std::weak_ptr<DoorInfo>();
 
 	this->mob = mob;
 	this->speed = speed;

Minecraft.World/AI/Goals/MoveThroughVillageGoal.h

@@ -12,9 +12,9 @@ private:
 	PathfinderMob *mob;
 	float speed;
 	Path *path;
-	std::<DoorInfo> doorInfo;
+	std::weak_ptr<DoorInfo> doorInfo;
 	bool onlyAtNight;
-	std::vector< std::<DoorInfo> > visited;
+	std::vector< std::weak_ptr<DoorInfo> > visited;
 
 public:
 	MoveThroughVillageGoal(PathfinderMob *mob, float speed, bool onlyAtNight);

Minecraft.World/AI/Goals/MoveTowardsTargetGoal.cpp

@@ -16,7 +16,7 @@ MoveTowardsTargetGoal::MoveTowardsTargetGoal(PathfinderMob *mob, float speed, fl
 
 bool MoveTowardsTargetGoal::canUse()
 {
-	target = std::<Mob>(mob->getTarget());
+	target = std::weak_ptr<Mob>(mob->getTarget());
 	if (target.lock() == NULL) return false;
 	if (target.lock()->distanceToSqr(mob->shared_from_this()) > within * within) return false;
 	Vec3 *pos = RandomPos::getPosTowards(dynamic_pointer_cast<PathfinderMob>(mob->shared_from_this()), 16, 7, Vec3::newTemp(target.lock()->x, target.lock()->y, target.lock()->z));
@@ -34,7 +34,7 @@ bool MoveTowardsTargetGoal::canContinueToUse()
 
 void MoveTowardsTargetGoal::stop()
 {
-	target = std::<Mob>();
+	target = std::weak_ptr<Mob>();
 }
 
 void MoveTowardsTargetGoal::start()

Minecraft.World/AI/Goals/MoveTowardsTargetGoal.h

@@ -6,7 +6,7 @@ class MoveTowardsTargetGoal : public Goal
 {
 private:
 	PathfinderMob *mob;
-	std::<Mob> target;
+	std::weak_ptr<Mob> target;
 	double wantedX, wantedY, wantedZ;
 	float speed, within;
 

Minecraft.World/AI/Goals/NearestAttackableTargetGoal.cpp

@@ -41,7 +41,7 @@ bool NearestAttackableTargetGoal::canUse()
 		std::shared_ptr<Mob> potentialTarget = mob->level->getNearestAttackablePlayer(mob->shared_from_this(), within);
 		if (canAttack(potentialTarget, false))
 		{
-			target = std::<Mob>(potentialTarget);
+			target = std::weak_ptr<Mob>(potentialTarget);
 			return true;
 		}
 	}
@@ -55,7 +55,7 @@ bool NearestAttackableTargetGoal::canUse()
 			std::shared_ptr<Mob> potTarget = dynamic_pointer_cast<Mob>(*it);
 			if (canAttack(potTarget, false))
 			{
-				target = std::<Mob>(potTarget);
+				target = std::weak_ptr<Mob>(potTarget);
 				return true;
 			}
 		}

Minecraft.World/AI/Goals/NearestAttackableTargetGoal.h

@@ -17,7 +17,7 @@ public:
 	};
 
 private:
-	std::<Mob> target;
+	std::weak_ptr<Mob> target;
 	const std::type_info& targetType;
 	int randomInterval;
 	DistComp *distComp;

Minecraft.World/AI/Goals/OcelotAttackGoal.cpp

@@ -8,7 +8,7 @@
 
 OzelotAttackGoal::OzelotAttackGoal(Mob *mob)
 {
-	target = std::<Mob>();
+	target = std::weak_ptr<Mob>();
 	attackTime = 0;
 	speed = 0;
 	trackTarget = false;
@@ -22,7 +22,7 @@ bool OzelotAttackGoal::canUse()
 {
 	std::shared_ptr<Mob> bestTarget = mob->getTarget();
 	if (bestTarget == NULL) return false;
-	target = std::<Mob>(bestTarget);
+	target = std::weak_ptr<Mob>(bestTarget);
 	return true;
 }
 
@@ -35,7 +35,7 @@ bool OzelotAttackGoal::canContinueToUse()
 
 void OzelotAttackGoal::stop()
 {
-	target = std::<Mob>();
+	target = std::weak_ptr<Mob>();
 	mob->getNavigation()->stop();
 }
 

Minecraft.World/AI/Goals/OcelotAttackGoal.h

@@ -7,7 +7,7 @@ class OzelotAttackGoal : public Goal
 private:
 	Level *level;
 	Mob *mob;
-	std::<Mob> target;
+	std::weak_ptr<Mob> target;
 	int attackTime;
 	float speed;
 	bool trackTarget;

Minecraft.World/AI/Goals/OfferFlowerGoal.cpp

@@ -16,7 +16,7 @@ bool OfferFlowerGoal::canUse()
 {
 	if (!golem->level->isDay()) return false;
 	if (golem->getRandom()->nextInt(8000) != 0) return false;
-	villager = std::<Villager>(dynamic_pointer_cast<Villager>( golem->level->getClosestEntityOfClass(typeid(Villager), golem->bb->grow(6, 2, 6), golem->shared_from_this()) ));
+	villager = std::weak_ptr<Villager>(dynamic_pointer_cast<Villager>( golem->level->getClosestEntityOfClass(typeid(Villager), golem->bb->grow(6, 2, 6), golem->shared_from_this()) ));
 	return villager.lock() != NULL;
 }
 
@@ -34,7 +34,7 @@ void OfferFlowerGoal::start()
 void OfferFlowerGoal::stop()
 {
 	golem->offerFlower(false);
-	villager = std::<Villager>();
+	villager = std::weak_ptr<Villager>();
 }
 
 void OfferFlowerGoal::tick()

Minecraft.World/AI/Goals/OfferFlowerGoal.h

@@ -11,7 +11,7 @@ public:
 
 private:
 	VillagerGolem *golem;
-	std::<Villager> villager;
+	std::weak_ptr<Villager> villager;
 	int _tick;
 
 public:

Minecraft.World/AI/Goals/OwnerHurtByTargetGoal.cpp

@@ -14,7 +14,7 @@ bool OwnerHurtByTargetGoal::canUse()
 	if (!tameAnimal->isTame()) return false;
 	std::shared_ptr<Mob> owner = tameAnimal->getOwner();
 	if (owner == NULL) return false;
-	ownerLastHurtBy = std::<Mob>(owner->getLastHurtByMob());
+	ownerLastHurtBy = std::weak_ptr<Mob>(owner->getLastHurtByMob());
 	return canAttack(ownerLastHurtBy.lock(), false);
 }
 

Minecraft.World/AI/Goals/OwnerHurtByTargetGoal.h

@@ -8,7 +8,7 @@ class OwnerHurtByTargetGoal : public TargetGoal
 {
 private:
 	TamableAnimal *tameAnimal; // Owner of this goal
-	std::<Mob> ownerLastHurtBy;
+	std::weak_ptr<Mob> ownerLastHurtBy;
 
 public:
 	OwnerHurtByTargetGoal(TamableAnimal *tameAnimal);

Minecraft.World/AI/Goals/OwnerHurtTargetGoal.cpp

@@ -14,7 +14,7 @@ bool OwnerHurtTargetGoal::canUse()
 	if (!tameAnimal->isTame()) return false;
 	std::shared_ptr<Mob> owner = tameAnimal->getOwner();
 	if (owner == NULL) return false;
-	ownerLastHurt = std::<Mob>(owner->getLastHurtMob());
+	ownerLastHurt = std::weak_ptr<Mob>(owner->getLastHurtMob());
 	return canAttack(ownerLastHurt.lock(), false);
 }
 

Minecraft.World/AI/Goals/OwnerHurtTargetGoal.h

@@ -8,7 +8,7 @@ class OwnerHurtTargetGoal : public TargetGoal
 {
 private:
 	TamableAnimal *tameAnimal; // Owner of this goal
-	std::<Mob> ownerLastHurt;
+	std::weak_ptr<Mob> ownerLastHurt;
 
 public:
 	OwnerHurtTargetGoal(TamableAnimal *tameAnimal);

Minecraft.World/AI/Goals/PlayGoal.cpp

@@ -11,7 +11,7 @@
 
 PlayGoal::PlayGoal(Villager *mob, float speed)
 {
-	followFriend = std::<Mob>();
+	followFriend = std::weak_ptr<Mob>();
 	wantedX = wantedY = wantedZ = 0.0;
 	playTime = 0;
 
@@ -38,7 +38,7 @@ bool PlayGoal::canUse()
 		double distSqr = friendV->distanceToSqr(mob->shared_from_this());
 		if (distSqr > closestDistSqr) continue;
 		closestDistSqr = distSqr;
-		followFriend = std::<Mob>(friendV);
+		followFriend = std::weak_ptr<Mob>(friendV);
 	}
 	delete children;
 
@@ -64,7 +64,7 @@ void PlayGoal::start()
 void PlayGoal::stop()
 {
 	mob->setChasing(false);
-	followFriend = std::<Mob>();
+	followFriend = std::weak_ptr<Mob>();
 }
 
 void PlayGoal::tick()

Minecraft.World/AI/Goals/PlayGoal.h

@@ -6,7 +6,7 @@ class PlayGoal : public Goal
 {
 private:
 	Villager *mob;
-	std::<Mob> followFriend;
+	std::weak_ptr<Mob> followFriend;
 	float speed;
 	double wantedX, wantedY, wantedZ;
 	int playTime;

Minecraft.World/AI/Goals/RestrictOpenDoorGoal.cpp

@@ -39,7 +39,7 @@ void RestrictOpenDoorGoal::stop()
 {
 	mob->getNavigation()->setCanOpenDoors(true);
 	mob->getNavigation()->setCanPassDoors(true);
-	doorInfo = std::<DoorInfo>();
+	doorInfo = std::weak_ptr<DoorInfo>();
 }
 
 void RestrictOpenDoorGoal::tick()

Minecraft.World/AI/Goals/RestrictOpenDoorGoal.h

@@ -9,7 +9,7 @@ class RestrictOpenDoorGoal : public Goal
 {
 private:
 	PathfinderMob *mob;
-	std::<DoorInfo> doorInfo;
+	std::weak_ptr<DoorInfo> doorInfo;
 
 public:
 	RestrictOpenDoorGoal(PathfinderMob *mob);

Minecraft.World/AI/Goals/SwellGoal.cpp

@@ -7,7 +7,7 @@
 
 SwellGoal::SwellGoal(Creeper *creeper)
 {
-	target = std::<Mob>();
+	target = std::weak_ptr<Mob>();
 
 	this->creeper = creeper;
 	setRequiredControlFlags(Control::MoveControlFlag);
@@ -22,12 +22,12 @@ bool SwellGoal::canUse()
 void SwellGoal::start()
 {
 	creeper->getNavigation()->stop();
-	target = std::<Mob>(creeper->getTarget());
+	target = std::weak_ptr<Mob>(creeper->getTarget());
 }
 
 void SwellGoal::stop()
 {
-	target = std::<Mob>();
+	target = std::weak_ptr<Mob>();
 }
 
 void SwellGoal::tick()

Minecraft.World/AI/Goals/SwellGoal.h

@@ -8,7 +8,7 @@ class SwellGoal : public Goal
 {
 private:
 	Creeper *creeper;
-	std::<Mob> target;
+	std::weak_ptr<Mob> target;
 
 public:
 	SwellGoal(Creeper *creeper);

Minecraft.World/AI/Goals/TakeFlowerGoal.cpp

@@ -12,7 +12,7 @@ TakeFlowerGoal::TakeFlowerGoal(Villager *villager)
 {
 	takeFlower = false;
 	pickupTick = 0;
-	golem = std::<VillagerGolem>();
+	golem = std::weak_ptr<VillagerGolem>();
 
 	this->villager = villager;
 	setRequiredControlFlags(Control::MoveControlFlag | Control::LookControlFlag);
@@ -36,7 +36,7 @@ bool TakeFlowerGoal::canUse()
 		std::shared_ptr<VillagerGolem> vg = dynamic_pointer_cast<VillagerGolem>(*it);
 		if (vg->getOfferFlowerTick() > 0)
 		{
-			golem = std::<VillagerGolem>(vg);
+			golem = std::weak_ptr<VillagerGolem>(vg);
 			break;
 		}
 	}
@@ -58,7 +58,7 @@ void TakeFlowerGoal::start()
 
 void TakeFlowerGoal::stop()
 {
-	golem = std::<VillagerGolem>();
+	golem = std::weak_ptr<VillagerGolem>();
 	villager->getNavigation()->stop();
 }
 

Minecraft.World/AI/Goals/TakeFlowerGoal.h

@@ -6,7 +6,7 @@ class TakeFlowerGoal : public Goal
 {
 private:
 	Villager *villager;
-	std::<VillagerGolem> golem;
+	std::weak_ptr<VillagerGolem> golem;
 	int pickupTick;
 	bool takeFlower;
 

Minecraft.World/AI/Goals/TemptGoal.cpp

@@ -9,7 +9,7 @@
 TemptGoal::TemptGoal(PathfinderMob *mob, float speed, int itemId, bool canScare)
 {
 	px = py = pz = pRotX = pRotY = 0.0;
-	player = std::<Player>();
+	player = std::weak_ptr<Player>();
 	calmDown = 0;
 	_isRunning = false;
 	oldAvoidWater = false;
@@ -28,7 +28,7 @@ bool TemptGoal::canUse()
 		--calmDown;
 		return false;
 	}
-	player = std::<Player>(mob->level->getNearestPlayer(mob->shared_from_this(), 10));
+	player = std::weak_ptr<Player>(mob->level->getNearestPlayer(mob->shared_from_this(), 10));
 	if (player.lock() == NULL) return false;
 	mob->setDespawnProtected();		// If we've got a nearby player, then consider this mob as something we'd miss if it despawned
 	std::shared_ptr<ItemInstance> item = player.lock()->getSelectedItem();
@@ -71,7 +71,7 @@ void TemptGoal::start()
 
 void TemptGoal::stop()
 {
-	player = std::<Player>();
+	player = std::weak_ptr<Player>();
 	mob->getNavigation()->stop();
 	calmDown = 100;
 	_isRunning = false;

Minecraft.World/AI/Goals/TemptGoal.h

@@ -8,7 +8,7 @@ private:
 	PathfinderMob *mob;
 	float speed;
 	double px, py, pz, pRotX, pRotY;
-	std::<Player> player;
+	std::weak_ptr<Player> player;
 	int calmDown ;
 	bool _isRunning;
 	int itemId;

Minecraft.World/Blocks/TileEntities/ChestTileEntity.cpp

@@ -158,10 +158,10 @@ void ChestTileEntity::checkNeighbors()
     if (hasCheckedNeighbors) return;
 
     hasCheckedNeighbors = true;
-    n = std::<ChestTileEntity>();
-    e = std::<ChestTileEntity>();
-    w = std::<ChestTileEntity>();
-    s = std::<ChestTileEntity>();
+    n = std::weak_ptr<ChestTileEntity>();
+    e = std::weak_ptr<ChestTileEntity>();
+    w = std::weak_ptr<ChestTileEntity>();
+    s = std::weak_ptr<ChestTileEntity>();
 
     if (level->getTile(x - 1, y, z) == Tile::chest_Id)
 	{

Minecraft.World/Blocks/TileEntities/ChestTileEntity.h

@@ -28,10 +28,10 @@ private:
 public:
 	bool isBonusChest;					// 4J added
 	bool hasCheckedNeighbors;
-    std::<ChestTileEntity> n;
-    std::<ChestTileEntity> e;
-    std::<ChestTileEntity> w;
-    std::<ChestTileEntity> s;
+    std::weak_ptr<ChestTileEntity> n;
+    std::weak_ptr<ChestTileEntity> e;
+    std::weak_ptr<ChestTileEntity> w;
+    std::weak_ptr<ChestTileEntity> s;
 
 	float openness, oOpenness;
 	int openCount;

Minecraft.World/Entities/Entity.cpp

@@ -257,7 +257,7 @@ void Entity::_init(bool useSmallId)
 	viewScale = 1.0;
 
 	blocksBuilding = false;
-	rider = std::<Entity>();
+	rider = std::weak_ptr<Entity>();
 	riding = nullptr;
 
 	//level = NULL; // Level is assigned to in the original c_tor code
@@ -1571,14 +1571,14 @@ void Entity::ride(std::shared_ptr<Entity> e)
 		{
 			// 4J Stu - Position should already be updated before the SetRidingPacket comes in
 			if(!level->isClientSide) moveTo(riding->x, riding->bb->y0 + riding->bbHeight, riding->z, yRot, xRot);
-			riding->rider = std::<Entity>();
+			riding->rider = std::weak_ptr<Entity>();
 		}
 		riding = nullptr;
 		return;
 	}
 	if (riding != NULL)
 	{
-		riding->rider = std::<Entity>();
+		riding->rider = std::weak_ptr<Entity>();
 	}
 	riding = e;
 	e->rider = shared_from_this();

Minecraft.World/Entities/Entity.h

@@ -52,7 +52,7 @@ public:
 	double viewScale;
 
 	bool blocksBuilding;
-	std::<Entity> rider;		// Changed to weak to avoid circular dependency between rider/riding entity
+	std::weak_ptr<Entity> rider;		// Changed to weak to avoid circular dependency between rider/riding entity
 	std::shared_ptr<Entity> riding;
 
 	Level *level;

Minecraft.World/Entities/Mobs/Animal.h

@@ -13,7 +13,7 @@ private:
 
 //	int inLove;							// 4J removed - now synched data
 	int loveTime;
-	std::<Player> loveCause;
+	std::weak_ptr<Player> loveCause;
 
 public:
 	Animal(Level *level);

Minecraft.World/Entities/Mobs/Boat.cpp

@@ -434,7 +434,7 @@ void Boat::tick()
 
 	if (rider.lock() != NULL)
 	{
-		if (rider.lock()->removed) rider = std::<Entity>();
+		if (rider.lock()->removed) rider = std::weak_ptr<Entity>();
 	}
 }
 

Minecraft.World/Entities/Mobs/Minecart.cpp

@@ -696,7 +696,7 @@ void Minecart::tick()
 				{
 					rider.lock()->riding = nullptr;
 				}
-				rider = std::<Entity>();
+				rider = std::weak_ptr<Entity>();
 			}
 		}
 

Minecraft.World/Entities/Mobs/Villager.cpp

@@ -36,9 +36,9 @@ void Villager::_init(int profession)
 	villageUpdateInterval = 0;
 	inLove = false;
 	chasing = false;
-	village = std::<Village>();
+	village = std::weak_ptr<Village>();
 
-	tradingPlayer = std::<Player>();
+	tradingPlayer = std::weak_ptr<Player>();
 	offers = NULL;
 	updateMerchantTimer = 0;
 	addRecipeOnUpdate = false;
@@ -341,7 +341,7 @@ void Villager::die(DamageSource *source)
 
 void Villager::setTradingPlayer(std::shared_ptr<Player> player)
 {
-	tradingPlayer = std::<Player>(player);
+	tradingPlayer = std::weak_ptr<Player>(player);
 }
 
 std::shared_ptr<Player> Villager::getTradingPlayer()

Minecraft.World/Entities/Mobs/Villager.h

@@ -32,9 +32,9 @@ private:
 
 	bool inLove;
 	bool chasing;
-	std::<Village> village;
+	std::weak_ptr<Village> village;
 
-	std::<Player> tradingPlayer;
+	std::weak_ptr<Player> tradingPlayer;
 	MerchantRecipeList *offers;
 	int updateMerchantTimer;
 	bool addRecipeOnUpdate;

Minecraft.World/Entities/Mobs/VillagerGolem.cpp

@@ -28,7 +28,7 @@ VillagerGolem::VillagerGolem(Level *level) : Golem(level)
 	health = getMaxHealth();
 
 	villageUpdateInterval = 0;
-	village = std::<Village>();
+	village = std::weak_ptr<Village>();
 	attackAnimationTick = 0;
 	offerFlowerTick = 0;
 

Minecraft.World/Entities/Mobs/VillagerGolem.h

@@ -16,7 +16,7 @@ protected:
 
 private:
 	int villageUpdateInterval;
-	std::<Village> village;
+	std::weak_ptr<Village> village;
 	int attackAnimationTick;
 	int offerFlowerTick;
 

Minecraft.World/Level/Events/VillageSiege.cpp

@@ -11,7 +11,7 @@ VillageSiege::VillageSiege(Level *level)
 	siegeState = SIEGE_NOT_INITED;
 	siegeCount = 0;
 	nextSpawnTime = 0;
-	village = std::<Village>();
+	village = std::weak_ptr<Village>();
 	spawnX = spawnY = spawnZ = 0;
 
 	this->level = level;

Minecraft.World/Level/Events/VillageSiege.h

@@ -8,7 +8,7 @@ private:
 	int siegeState;
 	int siegeCount;
 	int nextSpawnTime;
-	std::<Village> village;
+	std::weak_ptr<Village> village;
 	int spawnX, spawnY, spawnZ;
 
 	static const int SIEGE_NOT_INITED = -1;

Minecraft.World/Level/Level.cpp

@@ -2273,7 +2273,7 @@ void Level::tickEntities()
 		{
 			if (e->riding->removed || e->riding->rider.lock() != e)
 			{
-				e->riding->rider = std::<Entity>();
+				e->riding->rider = std::weak_ptr<Entity>();
 				e->riding = nullptr;
 			}
 			else
@@ -2521,7 +2521,7 @@ void Level::tick(std::shared_ptr<Entity> e, bool actual)
 			if (e->rider.lock()->removed || e->rider.lock()->riding != e)
 			{
 				e->rider.lock()->riding = nullptr;
-				e->rider = std::<Entity>();
+				e->rider = std::weak_ptr<Entity>();
 			}
 			else
 			{

Minecraft.World/Player/Player.cpp

@@ -603,7 +603,7 @@ void Player::ride(std::shared_ptr<Entity> e)
 
 		if (riding != NULL)
 		{
-			riding->rider = std::<Entity>();
+			riding->rider = std::weak_ptr<Entity>();
 		}
 		riding = nullptr;