summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-11-15 22:36:31 +0100
committerHowaner <franzi.moos@googlemail.com>2014-11-15 22:36:31 +0100
commit277151582fbb0652dcf4e15f67d41f90e08bdeeb (patch)
treefe2c700c7fba45840ced4a2e2a8e31927db57978
parentUpdated APIDump (diff)
downloadcuberite-277151582fbb0652dcf4e15f67d41f90e08bdeeb.tar
cuberite-277151582fbb0652dcf4e15f67d41f90e08bdeeb.tar.gz
cuberite-277151582fbb0652dcf4e15f67d41f90e08bdeeb.tar.bz2
cuberite-277151582fbb0652dcf4e15f67d41f90e08bdeeb.tar.lz
cuberite-277151582fbb0652dcf4e15f67d41f90e08bdeeb.tar.xz
cuberite-277151582fbb0652dcf4e15f67d41f90e08bdeeb.tar.zst
cuberite-277151582fbb0652dcf4e15f67d41f90e08bdeeb.zip
Diffstat (limited to '')
-rw-r--r--MCServer/Plugins/APIDump/APIDesc.lua1
-rw-r--r--src/ClientHandle.cpp7
-rw-r--r--src/ClientHandle.h7
3 files changed, 6 insertions, 9 deletions
diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 9ebc689a1..925f80252 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -536,7 +536,6 @@ end
GetViewDistance = { Params = "", Return = "number", Notes = "Returns the viewdistance (number of chunks loaded for the player in each direction)" },
HasPluginChannel = { Params = "ChannelName", Return = "bool", Notes = "Returns true if the client has registered to receive messages on the specified plugin channel." },
IsUUIDOnline = { Params = "UUID", Return = "bool", Notes = "(STATIC) Returns true if the UUID is generated by online auth, false if it is an offline-generated UUID. We use Version-3 UUIDs for offline UUIDs, online UUIDs are Version-4, thus we can tell them apart. Accepts both 32-char and 36-char UUIDs (with and without dashes). If the string given is not a valid UUID, returns false."},
- GetLastPlacedBlock = { Params = "", Return = "{{Vector3i}}", Notes = "Returns the positions from the last block that the player placed." },
Kick = { Params = "Reason", Return = "", Notes = "Kicks the user with the specified reason" },
SendPluginMessage = { Params = "Channel, Message", Return = "", Notes = "Sends the plugin message on the specified channel." },
SetClientBrand = { Params = "ClientBrand", Return = "", Notes = "Sets the value of the client's brand. Normally this value is received from the client by a MC|Brand plugin message, this function lets plugins overwrite the value." },
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index 9bf4875e2..83fb283b6 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -93,7 +93,7 @@ cClientHandle::cClientHandle(const cSocket * a_Socket, int a_ViewDistance) :
m_UniqueID(0),
m_HasSentPlayerChunk(false),
m_Locale("en_GB"),
- m_LastPlacedBlock(0, -1, 0),
+ m_LastPlacedSign(0, -1, 0),
m_ProtocolVersion(0)
{
m_Protocol = new cProtocolRecognizer(this);
@@ -1501,7 +1501,6 @@ void cClientHandle::HandlePlaceBlock(int a_BlockX, int a_BlockY, int a_BlockZ, e
{
m_Player->GetInventory().RemoveOneEquippedItem();
}
- m_LastPlacedBlock.Set(a_BlockX, a_BlockY, a_BlockZ);
cChunkInterface ChunkInterface(World->GetChunkMap());
NewBlock->OnPlacedByPlayer(ChunkInterface, *World, m_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, BlockType, BlockMeta);
@@ -1680,8 +1679,9 @@ void cClientHandle::HandleUpdateSign(
const AString & a_Line3, const AString & a_Line4
)
{
- if (m_LastPlacedBlock.Equals(Vector3i(a_BlockX, a_BlockY, a_BlockZ)))
+ if (m_LastPlacedSign.Equals(Vector3i(a_BlockX, a_BlockY, a_BlockZ)))
{
+ m_LastPlacedSign.Set(0, -1, 0);
m_Player->GetWorld()->SetSignLines(a_BlockX, a_BlockY, a_BlockZ, a_Line1, a_Line2, a_Line3, a_Line4, m_Player);
}
}
@@ -2262,6 +2262,7 @@ void cClientHandle::SendDisconnect(const AString & a_Reason)
void cClientHandle::SendEditSign(int a_BlockX, int a_BlockY, int a_BlockZ)
{
+ m_LastPlacedSign.Set(a_BlockX, a_BlockY, a_BlockZ);
m_Protocol->SendEditSign(a_BlockX, a_BlockY, a_BlockZ);
}
diff --git a/src/ClientHandle.h b/src/ClientHandle.h
index a0dd4ff7a..d8cc3c643 100644
--- a/src/ClientHandle.h
+++ b/src/ClientHandle.h
@@ -125,9 +125,6 @@ public:
inline bool IsLoggedIn(void) const { return (m_State >= csAuthenticating); }
- /** Returns the positions from the last block that the player placed. */
- const Vector3i & GetLastPlacedBlock(void) const { return m_LastPlacedBlock; } // tolua_export
-
/** Called while the client is being ticked from the world via its cPlayer object */
void Tick(float a_Dt);
@@ -436,8 +433,8 @@ private:
/** Client Settings */
AString m_Locale;
- /** The positions from the last block that the player placed. It's needed to verify the sign text change. */
- Vector3i m_LastPlacedBlock;
+ /** The positions from the last sign that the player placed. It's needed to verify the sign text change. */
+ Vector3i m_LastPlacedSign;
/** The plugin channels that the client has registered. */
cChannels m_PluginChannels;