From 17486c785331e809f5294fee40367b1590e0d36b Mon Sep 17 00:00:00 2001
From: faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6>
Date: Sat, 29 Sep 2012 20:43:42 +0000
Subject: Beds can be slept in now (it doesn't change the time though)

git-svn-id: http://mc-server.googlecode.com/svn/trunk@911 0a769ca7-a7f5-676a-18bf-c427514a06d6
---
 source/Protocol/Protocol.h             |  1 +
 source/Protocol/Protocol125.cpp        | 20 ++++++++++++++++++--
 source/Protocol/Protocol125.h          |  1 +
 source/Protocol/ProtocolRecognizer.cpp | 10 ++++++++++
 source/Protocol/ProtocolRecognizer.h   |  1 +
 5 files changed, 31 insertions(+), 2 deletions(-)

(limited to 'source/Protocol')

diff --git a/source/Protocol/Protocol.h b/source/Protocol/Protocol.h
index ada63af6b..c187387c1 100644
--- a/source/Protocol/Protocol.h
+++ b/source/Protocol/Protocol.h
@@ -84,6 +84,7 @@ public:
 	virtual void SendWholeInventory   (const cWindow    & a_Window) = 0;
 	virtual void SendWindowClose      (char a_WindowID) = 0;
 	virtual void SendWindowOpen       (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots) = 0;
+	virtual void SendUseBed           (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ ) = 0;
 
 	/// Returns the ServerID used for authentication through session.minecraft.net
 	virtual AString GetAuthServerID(void) = 0;
diff --git a/source/Protocol/Protocol125.cpp b/source/Protocol/Protocol125.cpp
index 1f2edad63..bec6a19b6 100644
--- a/source/Protocol/Protocol125.cpp
+++ b/source/Protocol/Protocol125.cpp
@@ -46,7 +46,7 @@ enum
 	PACKET_BLOCK_DIG                 = 0x0e,
 	PACKET_BLOCK_PLACE               = 0x0f,
 	PACKET_SLOT_SELECTED             = 0x10,
-	PACKET_ADD_TO_INV                = 0x11,  // TODO: Sure this is not Use Bed??
+	PACKET_USE_BED                   = 0x11,  // TODO: Sure this is not Use Bed??
 	PACKET_ANIMATION                 = 0x12,
 	PACKET_PACKET_ENTITY_ACTION      = 0x13,
 	PACKET_PLAYER_SPAWN              = 0x14,
@@ -778,6 +778,22 @@ void cProtocol125::SendWindowOpen(char a_WindowID, char a_WindowType, const AStr
 
 
 
+void cProtocol125::SendUseBed(const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ )
+{
+	cCSLock Lock(m_CSPacket);
+	WriteByte(PACKET_USE_BED);
+	WriteInt (a_Entity.GetUniqueID());
+	WriteByte(0);	// Unknown byte only 0 has been observed
+	WriteInt (a_BlockX);
+	WriteByte(a_BlockY);
+	WriteInt (a_BlockZ);
+	Flush();
+}
+
+
+
+
+
 AString cProtocol125::GetAuthServerID(void)
 {
 	// http://wiki.vg/wiki/index.php?title=Session&oldid=2262
@@ -985,7 +1001,7 @@ int cProtocol125::ParseEntityAction(void)
 {
 	HANDLE_PACKET_READ(ReadBEInt, int,  EntityID);
 	HANDLE_PACKET_READ(ReadChar,  char, ActionID);
-	// TODO: m_Client->HandleEntityAction(...);
+	m_Client->HandleEntityAction(EntityID, ActionID);
 	return PARSE_OK;
 }
 
diff --git a/source/Protocol/Protocol125.h b/source/Protocol/Protocol125.h
index 19a080506..84dfa7a72 100644
--- a/source/Protocol/Protocol125.h
+++ b/source/Protocol/Protocol125.h
@@ -68,6 +68,7 @@ public:
 	virtual void SendWholeInventory   (const cWindow    & a_Window) override;
 	virtual void SendWindowClose      (char a_WindowID) override;
 	virtual void SendWindowOpen       (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots) override;
+	virtual void SendUseBed           (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ ) override;
 	
 	virtual AString GetAuthServerID(void) override;
 	
diff --git a/source/Protocol/ProtocolRecognizer.cpp b/source/Protocol/ProtocolRecognizer.cpp
index ac231bc51..edd34b7dc 100644
--- a/source/Protocol/ProtocolRecognizer.cpp
+++ b/source/Protocol/ProtocolRecognizer.cpp
@@ -485,6 +485,16 @@ void cProtocolRecognizer::SendWindowOpen(char a_WindowID, char a_WindowType, con
 
 
 
+void cProtocolRecognizer::SendUseBed(const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ )
+{
+	ASSERT(m_Protocol != NULL);
+	m_Protocol->SendUseBed(a_Entity, a_BlockX, a_BlockY, a_BlockZ);
+}
+
+
+
+
+
 AString cProtocolRecognizer::GetAuthServerID(void)
 {
 	ASSERT(m_Protocol != NULL);
diff --git a/source/Protocol/ProtocolRecognizer.h b/source/Protocol/ProtocolRecognizer.h
index e870eca29..2e2f5a9e9 100644
--- a/source/Protocol/ProtocolRecognizer.h
+++ b/source/Protocol/ProtocolRecognizer.h
@@ -79,6 +79,7 @@ public:
 	virtual void SendWholeInventory   (const cWindow    & a_Window) override;
 	virtual void SendWindowClose      (char a_WindowID) override;
 	virtual void SendWindowOpen       (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots) override;
+	virtual void SendUseBed           (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ ) override;
 	
 	virtual AString GetAuthServerID(void) override;
 
-- 
cgit v1.2.3