22 files changed, 152 insertions, 74 deletions
diff --git a/source/Blocks/BlockHandler.h b/source/Blocks/BlockHandler.h
index 0487505ee..81d9f240c 100644
--- a/source/Blocks/BlockHandler.h
+++ b/source/Blocks/BlockHandler.h
@@ -66,7 +66,7 @@ public:
 	/// Called if the user right clicks the block and the block is useable
 	virtual void OnUse(cWorld * a_World, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ);
 	
-	/// Called when the item is mined to convert it into pickups. Pickups may specify multiple items.
+	/// Called when the item is mined to convert it into pickups. Pickups may specify multiple items. Appends items to a_Pickups, preserves its original contents
 	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta);
 	
 	/// Handles the dropping of a block based on what ConvertToDrops() returns. This will not destroy the block. a_Digger is the entity causing the drop; it may be NULL
diff --git a/source/ClientHandle.cpp b/source/ClientHandle.cpp
index 5bef11988..86a4aecc8 100644
--- a/source/ClientHandle.cpp
+++ b/source/ClientHandle.cpp
@@ -255,8 +255,8 @@ void cClientHandle::Authenticate(void)
 	// Send time
 	m_Protocol->SendTimeUpdate(World->GetWorldAge(), World->GetTimeOfDay());
 
-	// Send inventory
-	m_Player->GetInventory().SendWholeInventory(*this);
+	// Send contents of the inventory window
+	m_Protocol->SendWholeInventory(*m_Player->GetWindow());
 
 	// Send health
 	m_Player->SendHealth();
@@ -2004,15 +2004,6 @@ void cClientHandle::SendWeather(eWeather a_Weather)
 
 
 
-void cClientHandle::SendWholeInventory(const cInventory & a_Inventory)
-{
-	m_Protocol->SendWholeInventory(a_Inventory);
-}
-
-
-
-
-
 void cClientHandle::SendWholeInventory(const cWindow & a_Window)
 {
 	m_Protocol->SendWholeInventory(a_Window);
diff --git a/source/ClientHandle.h b/source/ClientHandle.h
index ef6dbd124..f7fa2b36f 100644
--- a/source/ClientHandle.h
+++ b/source/ClientHandle.h
@@ -134,7 +134,6 @@ public:
 	void SendUpdateSign          (int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4);
 	void SendUseBed              (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ );
 	void SendWeather             (eWeather a_Weather);
-	void SendWholeInventory      (const cInventory & a_Inventory);
 	void SendWholeInventory      (const cWindow    & a_Window);
 	void SendWindowClose         (const cWindow    & a_Window);
 	void SendWindowOpen          (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots);
diff --git a/source/Inventory.cpp b/source/Inventory.cpp
index d5fc7f0d8..90b998358 100644
--- a/source/Inventory.cpp
+++ b/source/Inventory.cpp
@@ -393,15 +393,6 @@ void cInventory::CopyToItems(cItems & a_Items)
 
 
 
-void cInventory::SendWholeInventory(cClientHandle & a_Client)
-{
-	a_Client.SendWholeInventory(*this);
-}
-
-
-
-
-
 void cInventory::SendSlot(int a_SlotNum)
 {
 	cItem Item(GetSlot(a_SlotNum));
diff --git a/source/Inventory.h b/source/Inventory.h
index f8f8042f4..3c6a19de8 100644
--- a/source/Inventory.h
+++ b/source/Inventory.h
@@ -110,8 +110,6 @@ public:
 	
 	// tolua_end
 
-	void SendWholeInventory(cClientHandle & a_Client);
-
 	/// Returns the player associated with this inventory (const version)
 	const cPlayer & GetOwner(void) const { return m_Owner; }
 	
diff --git a/source/Mobs/AggressiveMonster.cpp b/source/Mobs/AggressiveMonster.cpp
index 88bd2743a..cc7e7da2b 100644
--- a/source/Mobs/AggressiveMonster.cpp
+++ b/source/Mobs/AggressiveMonster.cpp
@@ -44,7 +44,7 @@ void cAggressiveMonster::InStateChasing(float a_Dt)
 		Vector3f Their = Vector3f( m_Target->GetPosition() );
 		if ((Their - Pos).Length() <= m_AttackRange)
 		{
-			cMonster::Attack(a_Dt);
+			Attack(a_Dt);
 		}
 		MoveToPosition(Their + Vector3f(0, 0.65f, 0));
 	}
diff --git a/source/Mobs/Blaze.cpp b/source/Mobs/Blaze.cpp
index 74c82c081..f9c05b17a 100644
--- a/source/Mobs/Blaze.cpp
+++ b/source/Mobs/Blaze.cpp
@@ -2,7 +2,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Blaze.h"
-
+#include "../World.h"
 
 
 
@@ -25,3 +25,28 @@ void cBlaze::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 
 
 
+
+void cBlaze::Attack(float a_Dt)
+{
+	m_AttackInterval += a_Dt * m_AttackRate;
+
+	if (m_Target != NULL && m_AttackInterval > 3.0)
+	{
+		// Setting this higher gives us more wiggle room for attackrate
+		Vector3d Speed = GetLookVector() * 20;
+		Speed.y = Speed.y + 1;
+		cFireChargeEntity * FireCharge = new cFireChargeEntity(this, GetPosX(), GetPosY() + 1, GetPosZ(), Speed);
+		if (FireCharge == NULL)
+		{
+			return;
+		}
+		if (!FireCharge->Initialize(m_World))
+		{
+			delete FireCharge;
+			return;
+		}
+		m_World->BroadcastSpawnEntity(*FireCharge);
+		m_AttackInterval = 0.0;
+		// ToDo: Shoot 3 fireballs instead of 1.
+	}
+}
+\ No newline at end of file
diff --git a/source/Mobs/Blaze.h b/source/Mobs/Blaze.h
index 9df57530e..cdb3a1306 100644
--- a/source/Mobs/Blaze.h
+++ b/source/Mobs/Blaze.h
@@ -18,6 +18,7 @@ public:
 	CLASS_PROTODEF(cBlaze);
 	
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+	virtual void Attack(float a_Dt) override;
 } ;
 
 
diff --git a/source/Mobs/Ghast.cpp b/source/Mobs/Ghast.cpp
index 419c8474d..96a29b2d8 100644
--- a/source/Mobs/Ghast.cpp
+++ b/source/Mobs/Ghast.cpp
@@ -2,7 +2,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Ghast.h"
-
+#include "../World.h"
 
 
 
@@ -25,3 +25,30 @@ void cGhast::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 
 
 
+
+void cGhast::Attack(float a_Dt)
+{
+	m_AttackInterval += a_Dt * m_AttackRate;
+	
+	if (m_Target != NULL && m_AttackInterval > 3.0)
+	{
+		// Setting this higher gives us more wiggle room for attackrate
+		Vector3d Speed = GetLookVector() * 20;
+		Speed.y = Speed.y + 1;
+		cGhastFireballEntity * GhastBall = new cGhastFireballEntity(this, GetPosX(), GetPosY() + 1, GetPosZ(), Speed);
+		if (GhastBall == NULL)
+		{
+			return;
+		}
+		if (!GhastBall->Initialize(m_World))
+		{
+			delete GhastBall;
+			return;
+		}
+		m_World->BroadcastSpawnEntity(*GhastBall);
+		m_AttackInterval = 0.0;
+	}
+}
+
+
+
diff --git a/source/Mobs/Ghast.h b/source/Mobs/Ghast.h
index a2adc21b9..43e8bedb6 100644
--- a/source/Mobs/Ghast.h
+++ b/source/Mobs/Ghast.h
@@ -18,6 +18,7 @@ public:
 	CLASS_PROTODEF(cGhast);
 
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+	virtual void Attack(float a_Dt) override;
 
 	bool IsCharging(void) const {return false; }
 } ;
diff --git a/source/Mobs/Monster.cpp b/source/Mobs/Monster.cpp
index 72dfb2583..9d2be1e29 100644
--- a/source/Mobs/Monster.cpp
+++ b/source/Mobs/Monster.cpp
@@ -440,12 +440,12 @@ void cMonster::InStateEscaping(float a_Dt)
 void cMonster::Attack(float a_Dt)
 {
 	m_AttackInterval += a_Dt * m_AttackRate;
-	if ((m_Target != NULL) && (m_AttackInterval > 3.0))
-	{
-		// Setting this higher gives us more wiggle room for attackrate
-		m_AttackInterval = 0.0;
-		((cPawn *)m_Target)->TakeDamage(*this);
-	}
+    if ((m_Target != NULL) && (m_AttackInterval > 3.0))
+    {
+        // Setting this higher gives us more wiggle room for attackrate
+        m_AttackInterval = 0.0;
+        ((cPawn *)m_Target)->TakeDamage(*this);
+    }
 }
 
 
diff --git a/source/Mobs/Skeleton.cpp b/source/Mobs/Skeleton.cpp
index 37a724848..509c2191e 100644
--- a/source/Mobs/Skeleton.cpp
+++ b/source/Mobs/Skeleton.cpp
@@ -7,7 +7,6 @@
 
 
 
-
 cSkeleton::cSkeleton(bool IsWither) :
 	super("Skeleton", mtSkeleton, "mob.skeleton.hurt", "mob.skeleton.death", 0.6, 1.8),
 	m_bIsWither(IsWither)
@@ -28,3 +27,44 @@ void cSkeleton::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 
 
 
+
+void cSkeleton::MoveToPosition(const Vector3f & a_Position)
+{
+	m_Destination = a_Position;
+
+	// If the destination is in the sun and if it is not night AND the skeleton isn't on fire then block the movement.
+	if (!IsOnFire() && m_World->GetTimeOfDay() < 13187 && m_World->GetBlockSkyLight((int) a_Position.x, (int) a_Position.y, (int) a_Position.z) == 15)
+	{
+		m_bMovingToDestination = false;
+		return;
+	}
+	m_bMovingToDestination = true;
+}
+
+
+
+
+
+void cSkeleton::Attack(float a_Dt)
+{
+	m_AttackInterval += a_Dt * m_AttackRate;
+
+	if (m_Target != NULL && m_AttackInterval > 3.0)
+	{
+		// Setting this higher gives us more wiggle room for attackrate
+		Vector3d Speed = GetLookVector() * 20;
+		Speed.y = Speed.y + 1;
+		cArrowEntity * Arrow = new cArrowEntity(this, GetPosX(), GetPosY() + 1, GetPosZ(), Speed);
+		if (Arrow == NULL)
+		{
+			return;
+		}
+		if (!Arrow->Initialize(m_World))
+		{
+			delete Arrow;
+			return;
+		}
+		m_World->BroadcastSpawnEntity(*Arrow);
+		m_AttackInterval = 0.0;
+	}
+}
+\ No newline at end of file
diff --git a/source/Mobs/Skeleton.h b/source/Mobs/Skeleton.h
index 7a4af7e22..8f31b42e1 100644
--- a/source/Mobs/Skeleton.h
+++ b/source/Mobs/Skeleton.h
@@ -18,6 +18,8 @@ public:
 	CLASS_PROTODEF(cSkeleton);
 
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+	virtual void MoveToPosition(const Vector3f & a_Position) override;
+	virtual void Attack(float a_Dt) override;
 	bool IsWither(void) const { return m_bIsWither; };
 
 private:
diff --git a/source/Mobs/Zombie.cpp b/source/Mobs/Zombie.cpp
index 1752ec390..a485d2b55 100644
--- a/source/Mobs/Zombie.cpp
+++ b/source/Mobs/Zombie.cpp
@@ -30,3 +30,18 @@ void cZombie::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 
 
 
+
+void cZombie::MoveToPosition(const Vector3f & a_Position)
+{
+	m_Destination = a_Position;
+
+	// If the destination is in the sun and if it is not night AND the skeleton isn't on fire then block the movement.
+	if ((m_World->GetBlockSkyLight((int) a_Position.x, (int) a_Position.y, (int) a_Position.z) == 15) && (m_World->GetTimeOfDay() < 13187) && !IsOnFire())
+	{
+		m_bMovingToDestination = false;
+		return;
+	}
+	m_bMovingToDestination = true;
+}
+
+
diff --git a/source/Mobs/Zombie.h b/source/Mobs/Zombie.h
index 148b1121e..7e14fe42f 100644
--- a/source/Mobs/Zombie.h
+++ b/source/Mobs/Zombie.h
@@ -17,6 +17,7 @@ public:
 	CLASS_PROTODEF(cZombie);
 	
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+	virtual void MoveToPosition(const Vector3f & a_Position) override;
 
 	bool IsVillagerZombie(void) const {return m_bIsVillagerZombie; }
 	bool IsConverting(void) const {return m_bIsConverting; }
diff --git a/source/Protocol/Protocol.h b/source/Protocol/Protocol.h
index 6bea4edbb..5d66808cf 100644
--- a/source/Protocol/Protocol.h
+++ b/source/Protocol/Protocol.h
@@ -99,7 +99,6 @@ public:
 	virtual void SendUpdateSign          (int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4) = 0;
 	virtual void SendUseBed              (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ ) = 0;
 	virtual void SendWeather             (eWeather a_Weather) = 0;
-	virtual void SendWholeInventory      (const cInventory & a_Inventory) = 0;
 	virtual void SendWholeInventory      (const cWindow    & a_Window) = 0;
 	virtual void SendWindowClose         (const cWindow    & a_Window) = 0;
 	virtual void SendWindowOpen          (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots) = 0;
diff --git a/source/Protocol/Protocol125.cpp b/source/Protocol/Protocol125.cpp
index ef40f265a..4cb1197da 100644
--- a/source/Protocol/Protocol125.cpp
+++ b/source/Protocol/Protocol125.cpp
@@ -940,15 +940,6 @@ void cProtocol125::SendWeather(eWeather a_Weather)
 
 
 
-void cProtocol125::SendWholeInventory(const cInventory & a_Inventory)
-{
-	SendWholeInventory(*(a_Inventory.GetOwner().GetWindow()));
-}
-
-
-
-
-
 void cProtocol125::SendWholeInventory(const cWindow & a_Window)
 {
 	cCSLock Lock(m_CSPacket);
diff --git a/source/Protocol/Protocol125.h b/source/Protocol/Protocol125.h
index 1da50a1d4..ad61dea74 100644
--- a/source/Protocol/Protocol125.h
+++ b/source/Protocol/Protocol125.h
@@ -76,7 +76,6 @@ public:
 	virtual void SendUpdateSign          (int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4) override;
 	virtual void SendUseBed              (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ ) override;
 	virtual void SendWeather             (eWeather a_Weather) override;
-	virtual void SendWholeInventory      (const cInventory & a_Inventory) override;
 	virtual void SendWholeInventory      (const cWindow    & a_Window) override;
 	virtual void SendWindowClose         (const cWindow    & a_Window) override;
 	virtual void SendWindowOpen          (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots) override;
diff --git a/source/Protocol/Protocol17x.cpp b/source/Protocol/Protocol17x.cpp
index 38260d046..d0ecc5583 100644
--- a/source/Protocol/Protocol17x.cpp
+++ b/source/Protocol/Protocol17x.cpp
@@ -254,12 +254,10 @@ void cProtocol172::SendEntityLook(const cEntity & a_Entity)
 
 void cProtocol172::SendEntityMetadata(const cEntity & a_Entity)
 {
-	/*
-	// TODO
 	cPacketizer Pkt(*this, 0x1c);  // Entity Metadata packet
 	Pkt.WriteInt(a_Entity.GetUniqueID());
 	Pkt.WriteEntityMetadata(a_Entity);
-	*/
+	Pkt.WriteByte(0x7f);  // The termination byte
 }
 
 
@@ -587,6 +585,8 @@ void cProtocol172::SendSoundParticleEffect(int a_EffectID, int a_SrcX, int a_Src
 	cPacketizer Pkt(*this, 0x28);  // Effect packet
 	Pkt.WriteInt(a_EffectID);
 	Pkt.WriteInt(a_SrcX);
+	// TODO: Check if this is really an int
+	// wiki.vg says it's a byte, but that wouldn't cover the entire range needed (Y location * 8 = 0..2048)
 	Pkt.WriteInt(a_SrcY);
 	Pkt.WriteInt(a_SrcZ);
 	Pkt.WriteInt(a_Data);
@@ -746,7 +746,13 @@ void cProtocol172::SendTimeUpdate(Int64 a_WorldAge, Int64 a_TimeOfDay)
 
 void cProtocol172::SendUnloadChunk(int a_ChunkX, int a_ChunkZ)
 {
-	// TODO
+	cPacketizer Pkt(*this, 0x21);  // Chunk Data packet
+	Pkt.WriteInt(a_ChunkX);
+	Pkt.WriteInt(a_ChunkZ);
+	Pkt.WriteBool(true);
+	Pkt.WriteShort(0);  // Primary bitmap
+	Pkt.WriteShort(0);  // Add bitmap
+	Pkt.WriteInt(0);  // Compressed data size
 }
 
 
@@ -755,16 +761,27 @@ void cProtocol172::SendUnloadChunk(int a_ChunkX, int a_ChunkZ)
 
 void cProtocol172::SendUpdateSign(int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4)
 {
-	// TODO
+	cPacketizer Pkt(*this, 0x33);
+	Pkt.WriteInt(a_BlockX);
+	Pkt.WriteShort((short)a_BlockY);
+	Pkt.WriteInt(a_BlockZ);
+	Pkt.WriteString(a_Line1);
+	Pkt.WriteString(a_Line2);
+	Pkt.WriteString(a_Line3);
+	Pkt.WriteString(a_Line4);
 }
 
 
 
 
 
-void cProtocol172::SendUseBed(const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ )
+void cProtocol172::SendUseBed(const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ)
 {
-	// TODO
+	cPacketizer Pkt(*this, 0x0a);
+	Pkt.WriteInt(a_Entity.GetUniqueID());
+	Pkt.WriteInt(a_BlockX);
+	Pkt.WriteByte((Byte)a_BlockY);
+	Pkt.WriteInt(a_BlockZ);
 }
 
 
@@ -773,16 +790,9 @@ void cProtocol172::SendUseBed(const cEntity & a_Entity, int a_BlockX, int a_Bloc
 
 void cProtocol172::SendWeather(eWeather a_Weather)
 {
-	// TODO
-}
-
-
-
-
-
-void cProtocol172::SendWholeInventory(const cInventory & a_Inventory)
-{
-	// TODO
+	cPacketizer Pkt(*this, 0x2b);
+	Pkt.WriteByte((a_Weather == wSunny) ? 2 : 1);  // begin rain / end rain
+	Pkt.WriteFloat(0);  // unused
 }
 
 
diff --git a/source/Protocol/Protocol17x.h b/source/Protocol/Protocol17x.h
index e3a51b844..f63cd8187 100644
--- a/source/Protocol/Protocol17x.h
+++ b/source/Protocol/Protocol17x.h
@@ -85,7 +85,6 @@ public:
 	virtual void SendUpdateSign          (int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4) override;
 	virtual void SendUseBed              (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ ) override;
 	virtual void SendWeather             (eWeather a_Weather) override;
-	virtual void SendWholeInventory      (const cInventory & a_Inventory) override;
 	virtual void SendWholeInventory      (const cWindow    & a_Window) override;
 	virtual void SendWindowClose         (const cWindow    & a_Window) override;
 	virtual void SendWindowOpen          (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots) override;
diff --git a/source/Protocol/ProtocolRecognizer.cpp b/source/Protocol/ProtocolRecognizer.cpp
index 67f924d7e..501e8bbe0 100644
--- a/source/Protocol/ProtocolRecognizer.cpp
+++ b/source/Protocol/ProtocolRecognizer.cpp
@@ -605,16 +605,6 @@ void cProtocolRecognizer::SendWeather(eWeather a_Weather)
 
 
 
-void cProtocolRecognizer::SendWholeInventory(const cInventory & a_Inventory)
-{
-	ASSERT(m_Protocol != NULL);
-	m_Protocol->SendWholeInventory(a_Inventory);
-}
-
-
-
-
-
 void cProtocolRecognizer::SendWholeInventory(const cWindow & a_Window)
 {
 	ASSERT(m_Protocol != NULL);
diff --git a/source/Protocol/ProtocolRecognizer.h b/source/Protocol/ProtocolRecognizer.h
index 79dc5568f..9bf550309 100644
--- a/source/Protocol/ProtocolRecognizer.h
+++ b/source/Protocol/ProtocolRecognizer.h
@@ -111,7 +111,6 @@ public:
 	virtual void SendUpdateSign          (int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4) override;
 	virtual void SendUseBed              (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ ) override;
 	virtual void SendWeather             (eWeather a_Weather) override;
-	virtual void SendWholeInventory      (const cInventory & a_Inventory) override;
 	virtual void SendWholeInventory      (const cWindow    & a_Window) override;
 	virtual void SendWindowClose         (const cWindow    & a_Window) override;
 	virtual void SendWindowOpen          (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots) override;