Matt-One

i don't know why they change every time part of code so ppl have to remake patch and changes...every time mangos dev change one thing they broke another however im not a c++ programmer i understand just few...so i'm not able to create or modify a patch however i changed all the (uint64 guid) to (ObjectGuid guid) this should be work? about (MAKE_NEW_GUID(itr->first, 0, HIGHGUID_FUNCTION)); to (ObjectGuid(HIGHGUID_FUNCTION, itr->first)); i haven't find any code similar to this one...

well thanks i understand and how can i know the mangos changes like data.append(FUNCTION)(); to data << function(); ?? there is a "place" where can i find this changes?

some tips please to solve this merge conflict?

there is a method to see what changes are u doing for example with 9561 and 9565 ?? only for curiosity

hey thanks for the new patch...but i have a stupid problem i used your patch for 9558 on a clear mangos but rev 9559, all goes good with no error but now i tryed to update my mangos to the rev 9562 and i reiceved this error with git hash : $ git pull Updating 6486fa3..1b67e95 error: Entry 'src/game/MovementHandler.cpp' not uptodate. Cannot merge. what can i do? EDIT: I HAVE TRYED to Git pull again and i reiceve this error : $ git pull Remote: Counting object: 38, done. Remote: Compressing objects: 100% <23/23>, done. Remote: Total 23 <delta 21> , reused 0 <delta 0> Unpacking objects: 100% <23/23>, done. From git://github.com/mangos/mangos 1b67e95..407e1c8 master -> origin/master Updating: 6486fa3..407e1c8 error: Entry 'src/game/DBCStructure.h' not uptodate. Cannot merge.

patch maked good with mangos 9559 but he create only 2 .sql v01_vehicle_tables.sql and v02_vehicle_data.sql with old tasssadar patch there was 2 more .sql v03_creature_addon_tables.sql and v10_vehicle_test_data.sql is it normal?

Mangos 0.16.0 Rev 9511 Rogue Talent Vigor [Assassination Talent Tree] seems to be bugged....It should increase the energy by 10 but doesn't work