Shin33

very good

Is there any update for actual core?

Same Voldemmort

I 've conflicts :

CONFLICT (content): Merge conflict in src/game/World.cpp

Auto-merged src/game/World.h

CONFLICT (content): Merge conflict in src/game/World.h

Auto-merged src/mangosd/mangosd.conf.dist.in

CONFLICT (content): Merge conflict in src/mangosd/mangosd.conf.dist.in

Same on Debian

Apply manualy

work at rev 9020

work at rev 8850

Core: 8740

SD2: 1484

ACID: 3

DB: PSMDB rev 257

Core was generated by `./mangos-worldd'.
Program terminated with signal 6, Aborted.
[New process 11101]
[New process 11098]
[New process 11094]
[New process 11097]
[New process 11103]
[New process 11105]
[New process 11104]
[New process 11096]
[New process 11102]
#0  0xffffe430 in __kernel_vsyscall ()
#0  0xffffe430 in __kernel_vsyscall ()
No symbol table info available.
#1  0xb74cf640 in raise () from /lib/i686/cmov/libc.so.6
No symbol table info available.
#2  0xb74d1018 in abort () from /lib/i686/cmov/libc.so.6
No symbol table info available.
#3  0xb74c85be in __assert_fail () from /lib/i686/cmov/libc.so.6
No symbol table info available.
#4  0x0816e54c in Creature::AddToWorld (this=0x132e1a18)
   at ../../../src/game/../framework/GameSystem/TypeContainer.h:78
No locals.
#5  0x0824a0e3 in LoadHelper<Creature> (guid_set=@0xc44a8dc, cell=@0xb2f0bdac, 
   m=@0x11cda644, count=@0xb2f0be74, map=0xf7340d8)
   at ../../../src/game/ObjectGridLoader.cpp:146
   guid = <value optimized out>
   obj = (class Creature *) 0x132e1a18
   bg = (class BattleGround *) 0x0
#6  0x082495e1 in ObjectGridLoader::Visit (this=0xb2f0be64, m=@0x11cda644)
   at ../../../src/game/ObjectGridLoader.cpp:207
   x = 79
   y = <value optimized out>
   cell_pair = {x_coord = 79, y_coord = 211}
#7  0x082496df in ObjectGridLoader::Load (this=0xb2f0be64, grid=@0x11cda62c)
   at ../../../src/game/../framework/GameSystem/TypeContainerVisitor.h:64
No locals.
#8  0x08249795 in ObjectGridLoader::LoadN (this=0xb2f0be64)
   at ../../../src/game/../framework/GameSystem/GridLoader.h:53
   y = 4
   x = 7
#9  0x0821a4d8 in Map::EnsureGridLoaded (this=0xf7340d8, cell=@0xb2f0bf6c)
   at ../../../src/game/Map.cpp:411
   loader = {i_cell = {data = {Part = {grid_x = 9, grid_y = 26, 
       cell_x = 7, cell_y = 3, nocreate = 0, reserved = 0}, All = 816777}}, 
 i_grid = @0x11cd77e8, i_map = 0xf7340d8, i_gameObjects = 14, 
 i_creatures = 20, i_corpses = 0}
   grid = <value optimized out>
   __PRETTY_FUNCTION__ = "bool Map::EnsureGridLoaded(const Cell&)"
#10 0x0821a9fc in Map::UpdatePlayerVisibility (this=0xf7340d8, 
   player=0x132d87f8, cell=
       {data = {Part = {grid_x = 4, grid_y = 2, cell_x = 12, cell_y = 60, nocreate = 0, reserved = 89}, All = 3002122372}}, cellpair=
     {x_coord = 3002122340, y_coord = 3002122524})
   at ../../../src/game/Map.h:652
   pl_notifier = {i_player = @0x132d87f8}
   player_notifier = {i_visitor = @0xb2f0bf74}
   cell_lock = {i_cell = @0xb2f0c084, i_cellPair = @0xb2f0c064}
#11 0x082273ed in Map::PlayerRelocation (this=0xf7340d8, player=0x132d87f8, 
   x=-11643.3682, y=-3163.90796, z=0.173020422, orientation=3.33554935)
   at ../../../src/game/Map.cpp:881
   old_val = {x_coord = 81, y_coord = 208}
   new_val = {x_coord = 81, y_coord = 208}
   old_cell = {data = {Part = {grid_x = 10, grid_y = 26, cell_x = 1, 
     cell_y = 0, nocreate = 0, reserved = 0}, All = 5770}}
   new_cell = {data = {Part = {grid_x = 10, grid_y = 26, cell_x = 1, 
     cell_y = 0, nocreate = 0, reserved = 0}, All = 5770}}
   newGrid = <value optimized out>
   __PRETTY_FUNCTION__ = "void Map::PlayerRelocation(Player*, float, float, float, float)"
#12 0x082d84f4 in Player::SetPosition (this=0x132d87f8, x=-11643.3682, 
   y=-3163.90796, z=0.173020422, orientation=3.33554935, teleport=false)
   at ../../../src/game/Player.cpp:5672
   m = (class Map *) 0xf7340d8
   old_x = -11636.5
   old_y = -3162.55859
   old_z = inf
   old_r = 17154.9824
#13 0x083ea73c in WorldSession::HandleMovementOpcodes (this=0xadc00770, 
   recv_data=@0xadc05778) at ../../../src/game/MovementHandler.cpp:321
   opcode = 238
   mover = (class Unit *) 0x132d87f8
   plMover = (class Player *) 0x132d87f8
   guid = 3007
   movementInfo = {guid = 3007, flags = 1, unk1 = 0, time = 2590736679, 
 x = -11643.3682, y = -3163.90796, z = 0.173020422, o = 3.33554935, 
 t_guid = 0, t_x = 0, t_y = 0, t_z = 0, t_o = 0, t_time = 0, 
 t_seat = -11 'õ', s_pitch = 0, fallTime = 598, j_unk = 0, j_sinAngle = 0, 
 j_cosAngle = 0, j_xyspeed = 0, u_unk1 = 0}
   data = {<ByteBuffer> = {static DEFAULT_SIZE = 4096, _rpos = 0, 
   _wpos = 33, 
   _storage = {<std::_Vector_base<unsigned char, std::allocator<unsigned char> >> = {
       _M_impl = {<std::allocator<unsigned char>> = {<__gnu_cxx::new_allocator<unsigned char>> = {<No data fields>}, <No data fields>}, 
         _M_start = 0x132d6e50 "\\003¿\\v\\001", _M_finish = 0x132d6e71 "", 
         _M_end_of_storage = 0x132d6e71 ""}}, <No data fields>}}, 
 m_opcode = 238}
#14 0x08395fc3 in WorldSession::Update (this=0xadc00770)
   at ../../../src/game/WorldSession.cpp:238
   packet = (WorldPacket *) 0xadc05778
   currTime = <value optimized out>
#15 0x0838f335 in World::UpdateSessions (this=0x8585cf8, diff=102)
   at ../../../src/game/World.cpp:2069
   sess = (WorldSession *) 0x8585cf8
#16 0x0838fa3b in World::Update (this=0x8585cf8, diff=102)
   at ../../../src/game/World.cpp:1608
   autobroadcaston = 1
#17 0x0811a748 in WorldRunnable::run (this=0xf80b848)
   at ../../../src/mangosd/WorldRunnable.cpp:64
   diff = 102
   realCurrTime = 2590736678
   realPrevTime = <value optimized out>
   prevSleepTime = 98
#18 0x08422a9a in ACE_Based::Thread::ThreadTask (param=0xf80b848)
   at ../../../src/shared/Threading.cpp:183
No locals.
#19 0xb7e8afde in ACE_OS_Thread_Adapter::invoke (this=0xf80b878)
   at ../../../../dep/ACE_wrappers/ace/OS_Thread_Adapter.cpp:90
   hook = (class ACE_Thread_Hook *) 0x6
   func = (
   ACE_THR_FUNC_INTERNAL) 0x8422a80 <ACE_Based::Thread::ThreadTask(void*)>
   arg = (void *) 0xf80b848
   status = (ACE_THR_FUNC_RETURN) 0x0
#20 0xb7e34eb1 in ace_thread_adapter (args=0xf80b878)
   at ../../../../dep/ACE_wrappers/ace/Base_Thread_Adapter.cpp:124
   status = (ACE_THR_FUNC_RETURN) 0x0
#21 0xb77264c0 in start_thread () from /lib/i686/cmov/libpthread.so.0
No symbol table info available.
#22 0xb75846de in clone () from /lib/i686/cmov/libc.so.6
No symbol table info available.

thanks very well

Thanks, good job.

I' ve just a problem. When i just use this patch, it work well.

But when i use it with this other:

git pull git://github.com/Naicisum/mangos.git ahbot

I have a conglict (content): Merge conflict in src/game/World.cpp

Can you help me please? What can i do to fix that conflict?