Skip to content

Commit

Permalink
Simplying association check.
Browse files Browse the repository at this point in the history
  • Loading branch information
Stephen001 committed Apr 5, 2014
1 parent b25d05c commit a14b602
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 16 deletions.
6 changes: 3 additions & 3 deletions src/struct/TrackerPersistence.dm
Expand Up @@ -313,16 +313,16 @@ TrackerDB/Database
__removeDuplicates(var/TrackerEntry/entry)
var/list/L = new()
for (var/data in entry.ckeys)
if (!(data in L))
if (!L.Find(data))
L.Add(data)
entry.ckeys = L
L = new()
for (var/data in entry.ips)
if (!(data in L))
if (!L.Find(data))
L.Add(data)
entry.ips = L
L = new()
for (var/data in entry.cids)
if (!(data in L))
if (!L.Find(data))
L.Add(data)
entry.cids = L
18 changes: 5 additions & 13 deletions src/struct/chatter.dm
Expand Up @@ -846,25 +846,17 @@ mob
server_manager.bot.say("You do not have access to this command.", src)
return

var/mob/chatter/C
if(ismob(target)) C = target
else C = chatter_manager.getByKey(target)

var/TrackerEntry/entry

if(C && C.client) entry = tracker_manager.findByClient(C.client)
else
entry = tracker_manager.findByCkey(ckey(target))
if(!entry) entry = tracker_manager.findByIP(target)
if(!entry) entry = tracker_manager.findByCID(target)
entry = tracker_manager.findByCkey(target)
if(!entry) entry = tracker_manager.findByIP(target)
if(!entry) entry = tracker_manager.findByCID(target)

if(entry)
server_manager.bot.say("[target] has the following information in the tracker database:", src)
server_manager.bot.rawSay("<b>Associated ckeys:</b> [textutil.list2text(entry.ckeys, ", ")]", src)
server_manager.bot.rawSay("<b>Associated ips:</b> [textutil.list2text(entry.ips, ", ")]", src)
server_manager.bot.rawSay("<b>Associated computer ids:</b> [textutil.list2text(entry.cids, ", ")]", src)

else server_manager.bot.say("No information found for [target].", src)
else
server_manager.bot.say("No information found for [target].", src)

server_manager.logger.trace("[key] searched for \"[target]\" in the tracker database.")

Expand Down

0 comments on commit a14b602

Please sign in to comment.