diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index b7c3bdf65..9fef6246d 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -230,8 +230,9 @@ spell_scripts
                                             * datalong2 = creature entry (searching for a buddy, closest to source)
                                             * datalong3 = creature search radius
                                             * data_flags =  flag_target_as_source    = 0x01
+
 29 SCRIPT_COMMAND_MODIFY_NPC_FLAGS          source=worldobject or target=worldobject (datalong1==0), else source or target = creature
                                             * datalong=NPCFlags
-                                            * datalong1=creature entry
-                                            * datalong2=search radius
+                                            * datalong2=creature entry
+                                            * datalong3=search radius
                                             * data_flags = 0x00=toggle, 0x01=add, 0x02=remove
diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 42ca83996..b29454f28 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -3020,6 +3020,8 @@ void Map::ScriptsProcess()
                     else
                         pBuddy->SetFlag(UNIT_NPC_FLAGS, step.script->npcFlag.flag);
                 }
+
+                break;
             }
             default:
                 sLog.outError("Unknown SCRIPT_COMMAND_ %u called for script id %u.", step.script->command, step.script->id);
diff --git a/src/game/ScriptMgr.h b/src/game/ScriptMgr.h
index 127d3da97..807f833b1 100644
--- a/src/game/ScriptMgr.h
+++ b/src/game/ScriptMgr.h
@@ -314,10 +314,9 @@ struct ScriptInfo
         struct                                              // SCRIPT_COMMAND_MODIFY_NPC_FLAGS (29)
         {
             uint32 flag;                                    // datalong
-            uint32 creatureEntry;                           // datalong1
-            uint32 searchRadius;                            // datalong2
-            uint32 empty1;                                  // datalong3
-            uint32 empty2;                                  // datalong4
+            uint32 creatureEntry;                           // datalong2
+            uint32 searchRadius;                            // datalong3
+            uint32 empty1;                                  // datalong4
             uint32 data_flags;                              // data_flags
         } npcFlag;
 
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 2d2fdebdc..9bc84459f 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "11839"
+ #define REVISION_NR "11840"
 #endif // __REVISION_NR_H__