diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-03-14 14:46:20 +0100 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-03-14 14:46:20 +0100 |
| commit | 8b83c1a653fa43ef05c6150126149f4820084097 (patch) | |
| tree | 4688783dbca9b7a6f0ef662926d07e4c5edc25d6 | |
| parent | Fixed xofts issues (diff) | |
| parent | cPlugin:BindConsoleCommand can be called statically. (diff) | |
| download | cuberite-8b83c1a653fa43ef05c6150126149f4820084097.tar cuberite-8b83c1a653fa43ef05c6150126149f4820084097.tar.gz cuberite-8b83c1a653fa43ef05c6150126149f4820084097.tar.bz2 cuberite-8b83c1a653fa43ef05c6150126149f4820084097.tar.lz cuberite-8b83c1a653fa43ef05c6150126149f4820084097.tar.xz cuberite-8b83c1a653fa43ef05c6150126149f4820084097.tar.zst cuberite-8b83c1a653fa43ef05c6150126149f4820084097.zip | |
| -rw-r--r-- | src/Bindings/ManualBindings.cpp | 5 | ||||
| -rw-r--r-- | src/World.cpp | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/Bindings/ManualBindings.cpp b/src/Bindings/ManualBindings.cpp index 462ef3682..20bbc48f2 100644 --- a/src/Bindings/ManualBindings.cpp +++ b/src/Bindings/ManualBindings.cpp @@ -1522,7 +1522,10 @@ static int tolua_cPluginManager_BindConsoleCommand(lua_State * L) // Read the arguments to this API call: tolua_Error tolua_err; 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++; } diff --git a/src/World.cpp b/src/World.cpp index 8c3a1ff8a..012ba915b 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -2453,14 +2453,14 @@ cPlayer * cWorld::FindClosestPlayer(const Vector3d & a_Pos, float a_SightLimit, { cTracer LineOfSight(this); - float ClosestDistance = a_SightLimit; - cPlayer* ClosestPlayer = NULL; + double ClosestDistance = a_SightLimit; + cPlayer * ClosestPlayer = NULL; cCSLock Lock(m_CSPlayers); for (cPlayerList::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr) { Vector3f Pos = (*itr)->GetPosition(); - float Distance = (Pos - a_Pos).Length(); + double Distance = (Pos - a_Pos).Length(); if (Distance < ClosestDistance) { |