pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-11 21:01:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hateborne: grid assign match fix.

Browse Source
This commit is contained in:
JJ 2014-10-15 22:31:44 -04:00
parent fc8cb2b5b7
commit 6028dbb4e5
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
zone/waypoints.cpp
View File

@ -1084,14 +1084,14 @@ void ZoneDatabase::AssignGrid(Client *client, float x, float y, uint32 grid)
// how much it's allowed to be off by // how much it's allowed to be off by
#define _GASSIGN_TOLERANCE 1.0 #define _GASSIGN_TOLERANCE 1.0
if(results.RowCount() == 0) // try a fuzzy match if that didn't find it if (results.RowCount() == 0) // try a fuzzy match if that didn't find it
{ {
query = StringFormat("SELECT id,x,y FROM spawn2 WHERE zone='%s' AND " query = StringFormat("SELECT id,x,y FROM spawn2 WHERE zone='%s' AND "
"ABS( ABS(x) - ABS(%f) ) < %f AND " "ABS( ABS(x) - ABS(%f) ) < %f AND "
"ABS( ABS(y) - ABS(%f) ) < %f", "ABS( ABS(y) - ABS(%f) ) < %f",
zone->GetShortName(), x, _GASSIGN_TOLERANCE, y, _GASSIGN_TOLERANCE); zone->GetShortName(), x, _GASSIGN_TOLERANCE, y, _GASSIGN_TOLERANCE);
results = QueryDatabase(query); results = QueryDatabase(query);
if(!results.Success()) { if (!results.Success()) {
LogFile->write(EQEMuLog::Error, "Error querying fuzzy spawn2 '%s': '%s'", query.c_str(), results.ErrorMessage().c_str()); LogFile->write(EQEMuLog::Error, "Error querying fuzzy spawn2 '%s': '%s'", query.c_str(), results.ErrorMessage().c_str());
return; return;
} }
@ -1100,12 +1100,13 @@ void ZoneDatabase::AssignGrid(Client *client, float x, float y, uint32 grid)
matches = results.RowCount(); matches = results.RowCount();
} }
if (matches == 0) { if (matches == 0)
{
client->Message(0, "ERROR: Unable to assign grid - can't find it in spawn2"); client->Message(0, "ERROR: Unable to assign grid - can't find it in spawn2");
return; return;
} }
if(matches == 1) if(matches > 1)
{ {
client->Message(0, "ERROR: Unable to assign grid - multiple spawn2 rows match"); client->Message(0, "ERROR: Unable to assign grid - multiple spawn2 rows match");
return; return;
@ -1125,7 +1126,8 @@ void ZoneDatabase::AssignGrid(Client *client, float x, float y, uint32 grid)
return; return;
} }
if (results.RowsAffected() != 1) { if (results.RowsAffected() != 1)
{
client->Message(0, "ERROR: found spawn2 id %d but the update query failed", spawn2id); client->Message(0, "ERROR: found spawn2 id %d but the update query failed", spawn2id);
return; return;
} }
@ -1133,7 +1135,8 @@ void ZoneDatabase::AssignGrid(Client *client, float x, float y, uint32 grid)
if(client) if(client)
client->LogSQL(query.c_str()); client->LogSQL(query.c_str());
if(!fuzzy) { if (!fuzzy)
{
client->Message(0, "Grid assign: spawn2 id = %d updated - exact match", spawn2id); client->Message(0, "Grid assign: spawn2 id = %d updated - exact match", spawn2id);
return; return;
} }