# Conflicts: # src/server/game/Entities/Creature/Creature.cpp # src/server/game/Entities/Object/Object.cpp # src/server/game/Maps/Map.cpp # src/server/game/Maps/Map.h
# Conflicts: # src/server/game/Entities/Creature/Creature.cpp # src/server/game/Entities/Object/Object.cpp # src/server/game/Maps/Map.cpp # src/server/game/Maps/Map.h