problem installing two patches to the same source

[FONT=helvetica]Hi,I tried to install VASautobalance with Playerbots,but they want to modify the same lines in ScriptLoader.cpp,so I receive some warnings and the patch doesn’t install.[/FONT]

[FONT=helvetica]Could I make them applying to the last lines of my file instead of the lines they want to modify?How?[/FONT]

[FONT=helvetica]There is the error message (Git Bash):[/FONT]

patching file `src/server/game/Entities/Creature/Creature.cpp’

Hunk #1 succeeded at 1192 (offset 11 lines).

patching file `src/server/game/Entities/Unit/Unit.cpp’

Hunk #1 succeeded at 956 (offset 14 lines).

Hunk #2 succeeded at 1147 with fuzz 2 (offset 24 lines).

patching file `src/server/game/Scripting/ScriptLoader.cpp’

Hunk #2 FAILED at 1268.

1 out of 2 hunks FAILED – saving rejects to src/server/game/Scripting/ScriptLoa

der.cpp.rej

patching file `src/server/game/Scripting/ScriptMgr.cpp’

patching file `src/server/game/Scripting/ScriptMgr.h’

patching file `src/server/game/Spells/Auras/SpellAuraEffects.cpp’

patching file `src/server/game/World/World.cpp’

Hunk #1 succeeded at 1207 (offset 6 lines).

patching file `src/server/game/World/World.h’

Hunk #1 succeeded at 182 (offset 1 line).

Hunk #3 succeeded at 624 (offset 1 line).

patching file `src/server/scripts/Custom/CMakeLists.txt’

patching file `src/server/scripts/Custom/VAS_AutoBalance.cpp’

patching file `src/server/worldserver/worldserver.conf.dist’

Hunk #2 succeeded at 2654 (offset 8 lines).

And there is the ScriptLoader.rej file (where it saves rejects):


*** 1265,1270 ****

{

#ifdef SCRIPTS

/* This is where custom scripts should be added. */

#endif

}

— 1268,1274 ----

{

#ifdef SCRIPTS

/* This is where custom scripts should be added. */

  • AddSC_VAS_AutoBalance();
    

#endif

}

manually add the line.

Ok,but in the line I should add there is already something written from the other patch.Can I add that in the last line?