summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-11-15 14:27:50 +0100
committerHowaner <franzi.moos@googlemail.com>2014-11-15 14:27:50 +0100
commit8c3c11d6b33c8ff71ad3f4e2c6ca67fc835dea33 (patch)
treebfa873cf8eab872224f4bf60a690ded640731422
parentUpdated APIDump (diff)
downloadcuberite-8c3c11d6b33c8ff71ad3f4e2c6ca67fc835dea33.tar
cuberite-8c3c11d6b33c8ff71ad3f4e2c6ca67fc835dea33.tar.gz
cuberite-8c3c11d6b33c8ff71ad3f4e2c6ca67fc835dea33.tar.bz2
cuberite-8c3c11d6b33c8ff71ad3f4e2c6ca67fc835dea33.tar.lz
cuberite-8c3c11d6b33c8ff71ad3f4e2c6ca67fc835dea33.tar.xz
cuberite-8c3c11d6b33c8ff71ad3f4e2c6ca67fc835dea33.tar.zst
cuberite-8c3c11d6b33c8ff71ad3f4e2c6ca67fc835dea33.zip
Diffstat (limited to '')
-rw-r--r--MCServer/Plugins/APIDump/APIDesc.lua2
-rw-r--r--src/ClientHandle.h4
-rw-r--r--src/Entities/Player.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 97abab4a0..8491047d0 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -534,7 +534,7 @@ end
GetUUID = { Params = "", Return = "string", Notes = "Returns the authentication-based UUID of the client. This UUID should be used to identify the player when persisting any player-related data. Returns a 32-char UUID (no dashes)" },
GetUsername = { Params = "", Return = "string", Notes = "Returns the username that the client has provided" },
GetViewDistance = { Params = "", Return = "number", Notes = "Returns the viewdistance (number of chunks loaded for the player in each direction)" },
- GetSettedViewDistance = { Params = "", Return = "number", Notes = "Returns the view distance that the player set, not the used view distance." },
+ GetRequestedViewDistance = { Params = "", Return = "number", Notes = "Returns the view distance that the player request, not the used view distance." },
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."},
Kick = { Params = "Reason", Return = "", Notes = "Kicks the user with the specified reason" },
diff --git a/src/ClientHandle.h b/src/ClientHandle.h
index 20789621d..db386d8a3 100644
--- a/src/ClientHandle.h
+++ b/src/ClientHandle.h
@@ -223,8 +223,8 @@ public:
/** Returns the view distance that the player currently have. */
int GetViewDistance(void) const { return m_UsedViewDistance; }
- /** Returns the view distance that the player set, not the used view distance. */
- int GetSettedViewDistance(void) const { return m_SetViewDistance; }
+ /** Returns the view distance that the player request, not the used view distance. */
+ int GetRequestedViewDistance(void) const { return m_SetViewDistance; }
void SetLocale(AString & a_Locale) { m_Locale = a_Locale; }
AString GetLocale(void) const { return m_Locale; }
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 1fe14ff65..edcdb4799 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -1603,7 +1603,7 @@ bool cPlayer::DoMoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn)
SetWorld(a_World); // Chunks may be streamed before cWorld::AddPlayer() sets the world to the new value
// Update the view distance.
- m_ClientHandle->SetViewDistance(m_ClientHandle->GetSettedViewDistance());
+ m_ClientHandle->SetViewDistance(m_ClientHandle->GetRequestedViewDistance());
return true;
}