December 2014 files

Minecraft.World/VillagerGolem.h

@@ -31,12 +31,9 @@ public:
 
 protected:
 	virtual void serverAiMobStep();
-
-public:
-	virtual int getMaxHealth();
-
-protected:
+	virtual void registerAttributes();
 	virtual int decreaseAirSupply(int currentSupply);
+	virtual void doPush(shared_ptr<Entity> e);
 
 public:
 	virtual void aiStep();
@@ -61,4 +58,5 @@ public:
 	virtual bool isPlayerCreated();
 	virtual void setPlayerCreated(bool value);
 	virtual void die(DamageSource *source);
+	virtual bool hurt(DamageSource *source, float dmg);
 };