Parcourir la source

Merge branch 'fix-laston' into next

* fix-laston:
  * Fix LASTON not being shared

Conflicts:
	doc/UPDATES
Bryan Drewery il y a 14 ans
Parent
commit
c79b37c5ed
2 fichiers modifiés avec 1 ajouts et 2 suppressions
  1. 1 0
      doc/UPDATES
  2. 0 2
      src/userent.c

+ 1 - 0
doc/UPDATES

@@ -1,6 +1,7 @@
 next
 next
   * Bot will now jump from the server it's on if it is removed from the server list. (fixes a changing network bug)
   * Bot will now jump from the server it's on if it is removed from the server list. (fixes a changing network bug)
   * Properly honor exemptions when kicking matched RBL clients
   * Properly honor exemptions when kicking matched RBL clients
+  * Fix LASTON not being shared
 
 
 1.4.0 - http://wraith.botpack.net/milestone/1.4.0
 1.4.0 - http://wraith.botpack.net/milestone/1.4.0
   * Updated server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
   * Updated server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.

+ 0 - 2
src/userent.c

@@ -729,10 +729,8 @@ static bool laston_set(struct userrec *u, struct user_entry *e, void *buf)
     e->u.extra = (struct laston_info *) buf;
     e->u.extra = (struct laston_info *) buf;
   }
   }
 
 
-  /* FIXME: laston sharing is disabled until a better solution is found
   if (!noshare)
   if (!noshare)
     shareout("c LASTON %s %s %li\n", u->handle, li->lastonplace ? li->lastonplace : "-", li->laston);
     shareout("c LASTON %s %s %li\n", u->handle, li->lastonplace ? li->lastonplace : "-", li->laston);
-  */
 
 
   return 1;
   return 1;
 }
 }