Ver código fonte

* Fixed script command getusers causing 'player not attached' errors when asking for character count in entire server (bugreport:4591, since r14495).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14522 54d463be-8e91-2dee-dedb-b68131a5f0ec
ai4rei 14 anos atrás
pai
commit
72c5290837
2 arquivos alterados com 11 adições e 9 exclusões
  1. 2 0
      Changelog-Trunk.txt
  2. 9 9
      src/map/script.c

+ 2 - 0
Changelog-Trunk.txt

@@ -1,5 +1,7 @@
 Date	Added
 
+2010/11/30
+	* Fixed script command getusers causing 'player not attached' errors when asking for character count in entire server (bugreport:4591, since r14495). [Ai4rei]
 2010/11/29
 	* Resolved issues with item delay system. [Ai4rei]
 	- Fixed random crashes caused by map_session_data corruption due to out-of-bounds access to item_delay array (bugreport:4568, since r14455).

+ 9 - 9
src/map/script.c

@@ -8260,18 +8260,18 @@ BUILDIN_FUNC(getusers)
 
 	flag = script_getnum(st,2);
 
-	if(flag&0x8)
-	{// npc
-		bl = map_id2bl(st->oid);
-	}
-	else if((sd = script_rid2sd(st))!=NULL)
-	{// pc
-		bl = &sd->bl;
-	}
-
 	switch(flag&0x07)
 	{
 		case 0:
+			if(flag&0x8)
+			{// npc
+				bl = map_id2bl(st->oid);
+			}
+			else if((sd = script_rid2sd(st))!=NULL)
+			{// pc
+				bl = &sd->bl;
+			}
+
 			if(bl)
 			{
 				val = map[bl->m].users;