flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge branch 'master' into warnings

Browse Source
This commit is contained in:
Tycho 2014-03-14 06:46:20 -07:00
commit 8b83c1a653
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Bindings/ManualBindings.cpp
View File

@ -1522,7 +1522,10 @@ static int tolua_cPluginManager_BindConsoleCommand(lua_State * L)
// Read the arguments to this API call: // Read the arguments to this API call:
tolua_Error tolua_err; tolua_Error tolua_err;
int idx = 1; int idx = 1;
if (tolua_isusertype(L, 1, "cPluginManager", 0, &tolua_err)) if (
tolua_isusertype(L, 1, "cPluginManager", 0, &tolua_err) ||
tolua_isusertable(L, 1, "cPluginManager", 0, &tolua_err)
)
{ {
idx++; idx++;
} }

6
src/World.cpp
View File

@ -2453,14 +2453,14 @@ cPlayer * cWorld::FindClosestPlayer(const Vector3d & a_Pos, float a_SightLimit,
{ {
cTracer LineOfSight(this); cTracer LineOfSight(this);
float ClosestDistance = a_SightLimit; double ClosestDistance = a_SightLimit;
cPlayer* ClosestPlayer = NULL; cPlayer * ClosestPlayer = NULL;
cCSLock Lock(m_CSPlayers); cCSLock Lock(m_CSPlayers);
for (cPlayerList::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr) for (cPlayerList::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
{ {
Vector3f Pos = (*itr)->GetPosition(); Vector3f Pos = (*itr)->GetPosition();
float Distance = (Pos - a_Pos).Length(); double Distance = (Pos - a_Pos).Length();
if (Distance < ClosestDistance) if (Distance < ClosestDistance)
{ {