Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 42 insertions, 0 deletions

diff --git a/Minecraft.World/EntitySelector.cpp b/Minecraft.World/EntitySelector.cpp
new file mode 100644
index 00000000..36c7bf88
--- /dev/null
+++ b/Minecraft.World/EntitySelector.cpp
@@ -0,0 +1,42 @@
+#include "stdafx.h"
+#include "Container.h"
+#include "EntitySelector.h"
+
+const EntitySelector *EntitySelector::ENTITY_STILL_ALIVE = new AliveEntitySelector();
+const EntitySelector *EntitySelector::CONTAINER_ENTITY_SELECTOR = new ContainerEntitySelector(); 
+
+bool AliveEntitySelector::matches(shared_ptr<Entity> entity) const
+{
+	return entity->isAlive();
+}
+
+bool ContainerEntitySelector::matches(shared_ptr<Entity> entity) const
+{
+	return (dynamic_pointer_cast<Container>(entity) != NULL) && entity->isAlive();
+}
+
+MobCanWearArmourEntitySelector::MobCanWearArmourEntitySelector(shared_ptr<ItemInstance> item)
+{
+	this->item = item;
+}
+
+bool MobCanWearArmourEntitySelector::matches(shared_ptr<Entity> entity) const
+{
+	if ( !entity->isAlive() )						return false;
+	if ( !entity->instanceof(eTYPE_LIVINGENTITY) )	return false;
+	
+	shared_ptr<LivingEntity> mob = dynamic_pointer_cast<LivingEntity>(entity);
+
+	if (mob->getCarried(Mob::getEquipmentSlotForItem(item)) != NULL) return false;
+
+	if ( mob->instanceof(eTYPE_MOB) )
+	{
+		return dynamic_pointer_cast<Mob>(mob)->canPickUpLoot();
+	}
+	else if (mob->instanceof(eTYPE_PLAYER))
+	{
+		return true;
+	}
+
+	return false;
+}
\ No newline at end of file