11 files changed, 236 insertions, 2 deletions

diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj
index d2981df9b..c6c1bfa6f 100644
--- a/VC2008/MCServer.vcproj
+++ b/VC2008/MCServer.vcproj
@@ -1116,6 +1116,14 @@
 				Name="Entities"
 				>
 				<File
+					RelativePath="..\source\Entities\Boat.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\source\Entities\Boat.h"
+					>
+				</File>
+				<File
 					RelativePath="..\source\Entities\Entity.cpp"
 					>
 				</File>
@@ -2244,6 +2252,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\source\Items\ItemBoat.h"
+					>
+				</File>
+				<File
 					RelativePath="..\source\Items\ItemBow.h"
 					>
 				</File>
diff --git a/source/ClientHandle.h b/source/ClientHandle.h
index 67ddcb0ba..8631f4872 100644
--- a/source/ClientHandle.h
+++ b/source/ClientHandle.h
@@ -125,7 +125,7 @@ public:
 	void SendSpawnFallingBlock   (const cFallingBlock & a_FallingBlock);
 	void SendSpawnMob            (const cMonster & a_Mob);
 	void SendSpawnObject         (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, Byte a_Yaw, Byte a_Pitch);
-	void SendSpawnVehicle        (const cEntity & a_Vehicle, char a_VehicleType, char a_VehicleSubType);
+	void SendSpawnVehicle        (const cEntity & a_Vehicle, char a_VehicleType, char a_VehicleSubType = 0);
 	void SendTabCompletionResults(const AStringVector & a_Results);
 	void SendTeleportEntity      (const cEntity & a_Entity);
 	void SendThunderbolt         (int a_BlockX, int a_BlockY, int a_BlockZ);
diff --git a/source/Entities/Boat.cpp b/source/Entities/Boat.cpp
new file mode 100644
index 000000000..56e766dd4
--- /dev/null
+++ b/source/Entities/Boat.cpp
@@ -0,0 +1,87 @@
+
+// Boat.cpp
+
+// Implements the cBoat class representing a boat in the world
+
+#include "Globals.h"
+#include "Boat.h"
+#include "../World.h"
+#include "../ClientHandle.h"
+#include "Player.h"
+
+
+
+
+
+cBoat::cBoat(double a_X, double a_Y, double a_Z) :
+	super(etBoat, a_X, a_Y, a_Z, 0.98, 0.7)
+{
+	SetMass(20.f);
+	SetMaxHealth(6);
+	SetHealth(6);
+}
+
+
+
+
+void cBoat::SpawnOn(cClientHandle & a_ClientHandle)
+{
+	a_ClientHandle.SendSpawnVehicle(*this, 1);
+}
+
+
+
+
+
+void cBoat::DoTakeDamage(TakeDamageInfo & TDI)
+{
+	super::DoTakeDamage(TDI);
+
+	if (GetHealth() == 0)
+	{
+		Destroy(true);
+	}
+}
+
+
+
+
+
+void cBoat::OnRightClicked(cPlayer & a_Player)
+{
+	if (m_Attachee != NULL)
+	{
+		if (m_Attachee->GetUniqueID() == a_Player.GetUniqueID())
+		{
+			// This player is already sitting in, they want out.
+			a_Player.Detach();
+			return;
+		}
+		
+		if (m_Attachee->IsPlayer())
+		{
+			// Another player is already sitting in here, cannot attach
+			return;
+		}
+		
+		// Detach whatever is sitting in this boat now:
+		m_Attachee->Detach();
+	}
+	
+	// Attach the player to this boat
+	a_Player.AttachTo(this);
+}
+
+
+
+
+
+void cBoat::HandlePhysics(float a_Dt, cChunk & a_Chunk)
+{
+	super::HandlePhysics(a_Dt, a_Chunk);
+	BroadcastMovementUpdate();
+}
+
+
+
+
diff --git a/source/Entities/Boat.h b/source/Entities/Boat.h
new file mode 100644
index 000000000..734ebda83
--- /dev/null
+++ b/source/Entities/Boat.h
@@ -0,0 +1,38 @@
+
+// Boat.h
+
+// Declares the cBoat class representing a boat in the world
+
+
+
+
+
+#pragma once
+
+#include "Entity.h"
+#include "../Item.h"
+
+
+
+
+
+class cBoat :
+	public cEntity
+{
+	typedef cEntity super;
+	
+public:
+	CLASS_PROTODEF(cBoat);
+		
+	// cEntity overrides:
+	virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
+	virtual void OnRightClicked(cPlayer & a_Player) override;
+	virtual void DoTakeDamage(TakeDamageInfo & TDI) override;
+	virtual void HandlePhysics(float a_Dt, cChunk & a_Chunk) override;
+	
+	cBoat(double a_X, double a_Y, double a_Z);
+} ;
+
+
+
+
diff --git a/source/Entities/Entity.h b/source/Entities/Entity.h
index b063838eb..48d2e7602 100644
--- a/source/Entities/Entity.h
+++ b/source/Entities/Entity.h
@@ -92,6 +92,7 @@ public:
 		etMonster,
 		etFallingBlock,
 		etMinecart,
+		etBoat,
 		etTNT,
 		etProjectile,
 		
@@ -119,6 +120,7 @@ public:
 	bool IsPickup  (void) const { return (m_EntityType == etPickup); }
 	bool IsMob     (void) const { return (m_EntityType == etMob); }
 	bool IsMinecart(void) const { return (m_EntityType == etMinecart); }
+	bool IsBoat    (void) const { return (m_EntityType == etBoat); }
 	bool IsTNT     (void) const { return (m_EntityType == etTNT); }
 	
 	/// Returns true if the entity is of the specified class or a subclass (cPawn's IsA("cEntity") returns true)
diff --git a/source/Items/ItemBoat.h b/source/Items/ItemBoat.h
new file mode 100644
index 000000000..6e3395f1d
--- /dev/null
+++ b/source/Items/ItemBoat.h
@@ -0,0 +1,54 @@
+
+// ItemBoat.h
+
+// Declares the various boat ItemHandlers
+
+
+
+
+
+#pragma once
+
+#include "../Entities/Boat.h"
+
+
+
+
+
+class cItemBoatHandler :
+	public cItemHandler
+{
+	typedef cItemHandler super;
+	
+public:
+	cItemBoatHandler(int a_ItemType) :
+		super(a_ItemType)
+	{
+	}
+	
+	
+	
+	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Dir) override
+	{
+		if (a_Dir < 0)
+		{
+			return false;
+		}
+		
+		double x = (double)a_BlockX + 0.5;
+		double y = (double)a_BlockY + 0.5;
+		double z = (double)a_BlockZ + 0.5;
+
+		cBoat * Boat = NULL;
+
+		Boat = new cBoat (x, y, z);
+		Boat->Initialize(a_World);
+
+		return true;
+	}
+	
+} ;
+
+
+
+
diff --git a/source/Items/ItemHandler.cpp b/source/Items/ItemHandler.cpp
index 2ae193d52..374d0ebf5 100644
--- a/source/Items/ItemHandler.cpp
+++ b/source/Items/ItemHandler.cpp
@@ -8,6 +8,7 @@
 
 // Handlers:
 #include "ItemBed.h"
+#include "ItemBoat.h"
 #include "ItemBow.h"
 #include "ItemBrewingStand.h"
 #include "ItemBucket.h"
@@ -180,6 +181,11 @@ cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType)
 			return new cItemMinecartHandler(a_ItemType);
 		}
 		
+		case E_ITEM_BOAT:
+		{
+			return new cItemBoatHandler(a_ItemType);
+		}
+
 		// Food:
 		case E_ITEM_BREAD:
 		case E_ITEM_COOKIE:
diff --git a/source/WorldStorage/NBTChunkSerializer.cpp b/source/WorldStorage/NBTChunkSerializer.cpp
index 32ac0daea..11dc50ee3 100644
--- a/source/WorldStorage/NBTChunkSerializer.cpp
+++ b/source/WorldStorage/NBTChunkSerializer.cpp
@@ -19,6 +19,7 @@
 #include "../OSSupport/MakeDir.h"
 #include "FastNBT.h"
 #include "../Entities/FallingBlock.h"
+#include "../Entities/Boat.h"
 #include "../Entities/Minecart.h"
 #include "../Mobs/Monster.h"
 #include "../Entities/Pickup.h"
@@ -252,6 +253,17 @@ void cNBTChunkSerializer::AddBasicEntity(cEntity * a_Entity, const AString & a_C
 
 
 
+void cNBTChunkSerializer::AddBoatEntity(cBoat * a_Boat)
+{
+	m_Writer.BeginCompound("");
+		AddBasicEntity(a_Boat, "Boat");
+	m_Writer.EndCompound();
+}
+
+
+
+
+
 void cNBTChunkSerializer::AddFallingBlockEntity(cFallingBlock * a_FallingBlock)
 {
 	m_Writer.BeginCompound("");
@@ -462,6 +474,7 @@ void cNBTChunkSerializer::Entity(cEntity * a_Entity)
 	
 	switch (a_Entity->GetEntityType())
 	{
+		case cEntity::etBoat:         AddBoatEntity        ((cBoat *)            a_Entity); break;
 		case cEntity::etFallingBlock: AddFallingBlockEntity((cFallingBlock *)    a_Entity); break;
 		case cEntity::etMinecart:     AddMinecartEntity    ((cMinecart *)        a_Entity); break;
 		case cEntity::etMonster:      AddMonsterEntity     ((cMonster *)         a_Entity); break;
diff --git a/source/WorldStorage/NBTChunkSerializer.h b/source/WorldStorage/NBTChunkSerializer.h
index 481c578f3..9d4ac208c 100644
--- a/source/WorldStorage/NBTChunkSerializer.h
+++ b/source/WorldStorage/NBTChunkSerializer.h
@@ -19,6 +19,7 @@
 class cFastNBTWriter;
 class cEntity;
 class cBlockEntity;
+class cBoat;
 class cChestEntity;
 class cDispenserEntity;
 class cDropperEntity;
@@ -94,6 +95,7 @@ protected:
 	
 	// Entities:
 	void AddBasicEntity       (cEntity * a_Entity, const AString & a_ClassName);
+	void AddBoatEntity        (cBoat * a_Boat);
 	void AddFallingBlockEntity(cFallingBlock * a_FallingBlock);
 	void AddMinecartEntity    (cMinecart * a_Minecart);
 	void AddMonsterEntity     (cMonster * a_Monster);
diff --git a/source/WorldStorage/WSSAnvil.cpp b/source/WorldStorage/WSSAnvil.cpp
index fa0066dc6..4db1ed106 100644
--- a/source/WorldStorage/WSSAnvil.cpp
+++ b/source/WorldStorage/WSSAnvil.cpp
@@ -23,6 +23,7 @@
 #include "../OSSupport/MakeDir.h"
 #include "FastNBT.h"
 #include "../Mobs/Monster.h"
+#include "../Entities/Boat.h"
 #include "../Entities/FallingBlock.h"
 #include "../Entities/Minecart.h"
 #include "../Entities/Pickup.h"
@@ -911,7 +912,11 @@ void cWSSAnvil::LoadSignFromNBT(cBlockEntityList & a_BlockEntities, const cParse
 
 void cWSSAnvil::LoadEntityFromNBT(cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_EntityTagIdx, const char * a_IDTag, int a_IDTagLength)
 {
-	if (strncmp(a_IDTag, "FallingBlock", a_IDTagLength) == 0)
+	if (strncmp(a_IDTag, "Boat", a_IDTagLength) == 0)
+	{
+		LoadBoatFromNBT(a_Entities, a_NBT, a_EntityTagIdx);
+	}
+	else if (strncmp(a_IDTag, "FallingBlock", a_IDTagLength) == 0)
 	{
 		LoadFallingBlockFromNBT(a_Entities, a_NBT, a_EntityTagIdx);
 	}
@@ -987,6 +992,20 @@ void cWSSAnvil::LoadEntityFromNBT(cEntityList & a_Entities, const cParsedNBT & a
 
 
 
+void cWSSAnvil::LoadBoatFromNBT(cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_TagIdx)
+{
+	std::auto_ptr<cBoat> Boat(new cBoat(0, 0, 0));
+	if (!LoadEntityBaseFromNBT(*Boat.get(), a_NBT, a_TagIdx))
+	{
+		return;
+	}
+	a_Entities.push_back(Boat.release());
+}
+
+
+
+
+
 void cWSSAnvil::LoadFallingBlockFromNBT(cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_TagIdx)
 {
 	// TODO
diff --git a/source/WorldStorage/WSSAnvil.h b/source/WorldStorage/WSSAnvil.h
index d92a2df72..7685d2236 100644
--- a/source/WorldStorage/WSSAnvil.h
+++ b/source/WorldStorage/WSSAnvil.h
@@ -140,6 +140,7 @@ protected:
 	
 	void LoadEntityFromNBT(cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_EntityTagIdx, const char * a_IDTag, int a_IDTagLength);
 	
+	void LoadBoatFromNBT            (cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_TagIdx);
 	void LoadFallingBlockFromNBT    (cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_TagIdx);
 	void LoadMinecartRFromNBT       (cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_TagIdx);
 	void LoadMinecartCFromNBT       (cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_TagIdx);