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

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

1 files changed, 19 insertions, 16 deletions

diff --git a/Minecraft.World/PigZombie.h b/Minecraft.World/PigZombie.h
index b47efacb..21ccd49e 100644
--- a/Minecraft.World/PigZombie.h
+++ b/Minecraft.World/PigZombie.h
@@ -13,8 +13,11 @@ public:
 	static Entity *create(Level *level) { return new PigZombie(level); }
 
 private:
+	static AttributeModifier *SPEED_MODIFIER_ATTACKING;
+
 	int angerTime;
-    int playAngrySoundIn;
+	int playAngrySoundIn;
+	shared_ptr<Entity> lastAttackTarget;
 
 	void _init();
 
@@ -22,20 +25,20 @@ public:
 	PigZombie(Level *level);
 
 protected:
-	bool useNewAi();
+	virtual void registerAttributes();
+	virtual bool useNewAi();
 
 public:
-	virtual int getTexture();
-    virtual void tick();
-    virtual bool canSpawn();
-    virtual void addAdditonalSaveData(CompoundTag *tag);
-    virtual void readAdditionalSaveData(CompoundTag *tag);
+	virtual void tick();
+	virtual bool canSpawn();
+	virtual void addAdditonalSaveData(CompoundTag *tag);
+	virtual void readAdditionalSaveData(CompoundTag *tag);
 
 protected:
 	virtual shared_ptr<Entity> findAttackTarget();
 
 public:
-    virtual bool hurt(DamageSource *source, int dmg);
+	virtual bool hurt(DamageSource *source, float dmg);
 
 private:
 	void alert(shared_ptr<Entity> target);
@@ -45,16 +48,16 @@ protected:
 	virtual int getHurtSound();
 	virtual int getDeathSound();
 	virtual void dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel);
-	virtual void dropRareDeathLoot(int rareLootLevel);
-    virtual int getDeathLoot();
-
-private:
-	static shared_ptr<ItemInstance> sword;
 
 public:
-	virtual void finalizeMobSpawn();
+	virtual bool mobInteract(shared_ptr<Player> player);
 
-	shared_ptr<ItemInstance> getCarriedItem();
+protected:
+	virtual void dropRareDeathLoot(int rareLootLevel);
+	virtual int getDeathLoot();
+	virtual void populateDefaultEquipmentSlots();
 
-	static void staticCtor();
+
+public:
+	virtual MobGroupData *finalizeMobSpawn(MobGroupData *groupData, int extraData = 0); // 4J Added extraData param
 };